diff --git a/search_config.module b/search_config.module
index 65e3ac8..e004e43 100755
--- a/search_config.module
+++ b/search_config.module
@@ -13,15 +13,14 @@ use Drupal\Core\Url;
 use Drupal\Component\Utility\Html;
 
 /**
- * Implement hook_theme()
+ * Implements hook_theme().
  */
 function search_config_theme() {
-  return array(
-    'search_config_admin_label_form' => array(
+  return [
+    'search_config_admin_label_form' => [
       'render element' => 'form',
-      'template' => 'templates/search-config-admin-labels-form.html.twig',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
diff --git a/templates/search-config-admin-label-form.html.twig b/templates/search-config-admin-label-form.html.twig
new file mode 100644
index 0000000..9db4b49
--- /dev/null
+++ b/templates/search-config-admin-label-form.html.twig
@@ -0,0 +1,29 @@
+{% set labels = form['#field-labels'] %}
+{% set form_key = form_name %}
+{% for form_key, form_name in ['basic':'Basic'|t, 'advanced':'Advanced'|t]  %}
+    <table>
+        <tr>
+            <th colspan="2">
+                {{ '!type form label overrides'|t({'!type': form_name}) }}</th>
+            <th>{{ 'Title display'|t }}</th>
+        </tr>
+        {% for key, titles in labels %}
+            {% if key in form_key %}
+                set has_title_display = false
+                {% if is not null attribute(form.['title-display'], key) %}
+                    {% set has_title_display = true %}
+                {% endif %}
+            {% endif %}
+            <tr>
+                <td style= "vertical-align: top;">
+                    <label for = " {{ form.labels.key['#id'] }} " >
+                        {{ lables.key[0] }}
+                    </label>
+                    <em>{{ labels.key[1] }}</em>
+                </td>
+                <td style="vertical-align: top" {{ has_title_display ? '' : ' colspan="2"' }} > {{ form.labels.key }}</td>
+                {% if has_title_display %}<td>{{ form.title_display.key }}</td>{% endif %}
+            </tr>
+        {% endfor %}
+    </table>
+{% endfor %}
diff --git a/templates/search-config-admin-labels-form.html.twig b/templates/search-config-admin-labels-form.html.twig
deleted file mode 100644
index d96576a..0000000
--- a/templates/search-config-admin-labels-form.html.twig
+++ /dev/null
@@ -1,25 +0,0 @@
-{% set labels = form['#field-labels'] %}
-{% set form_key = form_name %}
-{% set basic, advanced = {{ 'Basic'|t }},{{ 'Advanced'|t }} %}
-{% for form_key in basic, advanced %}
-    <table>
-    <tr>
-        <th colspan="2">
-            {% set '!type' = form_name %}
-            {{ '!type form label overrides'|t, '!type'|t }}</th>
-        <th>{{ 'Title display'|t }}</th>
-    </tr>
-    {% set key = titles %}
-    {% for key in labels %}
-        {% set has_title_display =  {% if form.title-dispaly.key is not null %}{% endif %} %}
-        <tr>
-            <td style="vertical-align: top;">
-                <label for=" {{ form.labels.key['#id'] }}">{{ lables.key[0] }} </label>
-                    <em>{{ labels.key[1] }}</em>
-                </td>
-                <td style="vertical-align: top" {{ has_title_display ? '' : ' colspan="2"' }} >{{ drupal_render(form.labels.key) }}</td>
-                {% if has_title_display %}<td>{{ drupal_render(form.title_display.key) }}</td>{% endif %}
-            </tr>
-        {% endfor %}
-    </table>
-{% endfor %}