diff --git a/_includes/form.html b/_includes/form.html
index b78574ce2f71cd99578aa71d239144e54ad5c025..22a7d7c20ac0086b7d5de51b4a944dbb6fe6c83d 100644
--- a/_includes/form.html
+++ b/_includes/form.html
@@ -17,13 +17,9 @@
             <label>{{ f.translation | map: include.ln }}</label>
             <select id="{{ fields[0] }}" class="order-form form-control" onchange="createYml()">
               {% for v in fvalues %}
-                <optgroup label="{{ v[1] | map: 'title' | map: include.ln }}">
-                {% assign Tags=v[1] | map: 'Tags' %}
-                {% for tag in Tags %}
-                  {% for t in tag %}
-                  {% assign tt=t | first %}{% capture val %}{{ v[0]}},{{ tt[0] }}{% endcapture %}
-                  <option value="[{{ v[0]}},{{ tt[0] }}]" title="[ {{ v[0]}},{{ tt[0] }} ]"{% if default == val %} selected{% endif %}>{{ tt[1]  | map: include.ln }}</option>
-                  {% endfor %}
+                <optgroup label="{{ v[1].title | map: include.ln }}">
+                {% for tag in v[1].Tags %}
+                  <option value="[{{ v[0]}},{{ tag[0] }}]" title="[ {{ v[0]}},{{ tag[0] }} ]"{% if default == val %} selected{% endif %}>{{ tag[1]  | map: include.ln }}</option>
                 {% endfor %}
                 </optgroup>
               {% endfor %}