diff --git a/css/empty_autocomplete.css b/css/empty_autocomplete.css
index 21b1f0b..b82c469 100644
--- a/css/empty_autocomplete.css
+++ b/css/empty_autocomplete.css
@@ -4,10 +4,10 @@
 
 #entity-ajax-wrapper {
   display: inline-block;
-  margin-left: 20px; 
+  margin-left: 20px;
 }
 
 .custom-wrap-1 {
   display: inline-block;
-  margin-left: 20px; 
-}
\ No newline at end of file
+  margin-left: 20px;
+}
diff --git a/css/filter_fields_by_type.css b/css/filter_fields_by_type.css
index c5fa6f4..7c8886a 100644
--- a/css/filter_fields_by_type.css
+++ b/css/filter_fields_by_type.css
@@ -1,13 +1,12 @@
-
-.conditional-wrapper{
+.conditional-wrapper {
   display: flex;
   flex-direction: row;
- }
- .conditional-wrapper>div{
+}
+.conditional-wrapper>div {
   margin-right: 20px;
- }
+}
 
- #download_fields_table_as_csv{
+#download_fields_table_as_csv {
   background-image: url(../icons/csv.png);
   background-repeat: no-repeat;
   background-size: cover;
@@ -15,8 +14,8 @@
   transform: scale(0.4);
   margin-left: -38px;
   margin-top: -15px;
- }
+}
 
- #edit-conditional-wrapper-actions-submit{
+#edit-conditional-wrapper-actions-submit {
   margin-top: 2rem;
- }
+}
diff --git a/src/Form/FilterEntityTypesForm.php b/src/Form/FilterEntityTypesForm.php
index 15ccb7e..592aca0 100644
--- a/src/Form/FilterEntityTypesForm.php
+++ b/src/Form/FilterEntityTypesForm.php
@@ -193,7 +193,7 @@ class FilterEntityTypesForm extends FormBase {
       }
       $form['autocomplete_ajax_container']['filter_entity_types'] = [
         '#type' => 'textfield',
-        '#title' => $this->t('Search ' . $selected_entity_type . ' By Title'),
+        '#title' => $this->t('Search @entity_type By Title', ['@entity_type' => $selected_entity_type]),
         '#weight' => '10',
         '#maxlength' => 1280,
         '#description' => '',
@@ -265,13 +265,31 @@ class FilterEntityTypesForm extends FormBase {
 
     $label = $title ?? $field->label();
     if ($entity_type == 'block_content') {
-      return $this->t('<a href="/admin/structure/block/block-content/manage/' . $entity_name . '/fields/' . $entity_type . '.' . $entity_name . '.' . $field->getName() . '" target="_blank" >' . $label . '</a>');
+      return $this->t('<a href="/admin/structure/block/block-content/manage/@entity_name/fields/@entity_type.@entity_name.@field_name" target="_blank">@label</a>', [
+        '@entity_name' => $entity_name,
+        '@entity_type' => $entity_type,
+        '@field_name' => $field->getName(),
+        '@label' => $label,
+      ]);
+
     }
     elseif ($entity_type == 'node') {
-      return $this->t('<a href="/admin/structure/types/manage/' . $entity_name . '/fields/' . $entity_type . '.' . $entity_name . '.' . $field->getName() . '" target="_blank" >' . $label . '</a>');
+      return $this->t('<a href="/admin/structure/types/manage/@entity_name/fields/@entity_type.@entity_name.@field_name" target="_blank">@label</a>', [
+        '@entity_name' => $entity_name,
+        '@entity_type' => $entity_type,
+        '@field_name' => $field->getName(),
+        '@label' => $label,
+      ]);
+
     }
     elseif ($entity_type == 'paragraph') {
-      return $this->t('<a href="/admin/structure/paragraphs_type/' . $entity_name . '/fields/' . $entity_type . '.' . $entity_name . '.' . $field->getName() . '" target="_blank" >' . $label . '</a>');
+      return $this->t('<a href="/admin/structure/paragraphs_type/@entity_name/fields/@entity_type.@entity_name.@field_name" target="_blank">@label</a>', [
+        '@entity_name' => $entity_name,
+        '@entity_type' => $entity_type,
+        '@field_name' => $field->getName(),
+        '@label' => $label,
+      ]);
+
     }
   }