diff --git a/search_config.module b/search_config.module
index 81f0e12..353c616 100755
--- a/search_config.module
+++ b/search_config.module
@@ -121,7 +121,7 @@ function search_config_theme()  {
   return array(
     'search_config_admin_label_form' => array(
       'render element' => 'form',
-      'template' => 'templates/search-config-admin-labels-form.html.twig',
+      'template' => 'search-config-admin-labels-form.html.twig',
       ),
     );
 }
diff --git a/templates/search-config-admin-labels-form.html.twig b/templates/search-config-admin-labels-form.html.twig
index 726fb5e..54d50a4 100644
--- a/templates/search-config-admin-labels-form.html.twig
+++ b/templates/search-config-admin-labels-form.html.twig
@@ -1,22 +1,29 @@
 {% set labels = form['#field-labels'] %}
-{% set form_key = form_name %}s
-{% for form_key, form_name in ["'Basic'|t", "'Advanced'|t"]  %}
-    <table>
-        <tr>
-            <th colspan="2">
-                {{ '!type form label overrides'|t, {'!type': 'form_name'|t}}</th>
+{% 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 %}
-            {% 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>
+            {% 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 %}