diff --git a/dist/recline.js b/dist/recline.js
index 8f907d6b..3c2f6773 100644
--- a/dist/recline.js
+++ b/dist/recline.js
@@ -4045,16 +4045,16 @@ my.FilterEditor = Backbone.View.extend({
       <a href="#" class="js-add-filter">Add filter</a> \
       <form class="form-stacked js-add" style="display: none;"> \
         <div class="form-group"> \
-          <label>Field</label> \
-          <select class="fields form-control"> \
+          <label for="form-field-add-field">Field</label> \
+          <select id="form-field-add-field" class="fields form-control"> \
             {{#fields}} \
             <option value="{{id}}">{{label}}</option> \
             {{/fields}} \
           </select> \
         </div> \
         <div class="form-group"> \
-          <label>Filter type</label> \
-          <select class="filterType form-control"> \
+          <label for="form-field-filter-type">Filter type</label> \
+          <select id="form-field-filter-type" class="filterType form-control"> \
             <option value="term">Value</option> \
             <option value="range">Range</option> \
             <option value="geo_distance">Geo distance</option> \
diff --git a/src/view.flot.js b/src/view.flot.js
index 0197b874..17037b55 100644
--- a/src/view.flot.js
+++ b/src/view.flot.js
@@ -369,9 +369,9 @@ my.FlotControls = Backbone.View.extend({
     <form class="form-stacked"> \
       <div class="clearfix"> \
         <div class="form-group"> \
-          <label>Graph Type</label> \
+          <label for ="form-field-type">Graph Type</label> \
           <div class="input editor-type"> \
-            <select class="form-control"> \
+            <select id="form-field-type" class="form-control"> \
               <option value="lines-and-points">Lines and Points</option> \
               <option value="lines">Lines</option> \
               <option value="points">Points</option> \
@@ -381,9 +381,9 @@ my.FlotControls = Backbone.View.extend({
           </div> \
         </div> \
         <div class="form-group"> \
-          <label>Group Column (Axis 1)</label> \
+          <label for="field-form-group">Group Column (Axis 1)</label> \
           <div class="input editor-group"> \
-            <select class="form-control"> \
+            <select id="field-form-group" class="form-control"> \
               <option value="">Please choose ...</option> \
                 {{#fields}} \
               <option value="{{id}}">{{label}}</option> \
@@ -407,11 +407,11 @@ my.FlotControls = Backbone.View.extend({
   templateSeriesEditor: ' \
     <div class="editor-series js-series-{{seriesIndex}}"> \
       <div class="form-group"> \
-        <label>Series <span>{{seriesName}} (Axis 2)</span> \
+        <label for="form-field-{{seriesName}}">Series <span>{{seriesName}} (Axis 2)</span> \
           [<a href="#remove" class="action-remove-series">Remove</a>] \
         </label> \
         <div class="input"> \
-          <select class="form-control"> \
+          <select id="form-field-{{seriesName}}" class="form-control"> \
           {{#fields}} \
           <option value="{{id}}">{{label}}</option> \
           {{/fields}} \
diff --git a/src/view.map.js b/src/view.map.js
index be837c2b..4e8b3ff0 100644
--- a/src/view.map.js
+++ b/src/view.map.js
@@ -520,18 +520,18 @@ my.MapMenu = Backbone.View.extend({
               GeoJSON field</label> \
         </div> \
         <div class="editor-field-type-latlon"> \
-          <label>Latitude field</label> \
+          <label for="form-field-lat-field">Latitude field</label> \
           <div class="input editor-lat-field"> \
-            <select class="form-control"> \
+            <select id="form-field-lat-field" class="form-control"> \
             <option value=""></option> \
             {{#fields}} \
             <option value="{{id}}">{{label}}</option> \
             {{/fields}} \
             </select> \
           </div> \
-          <label>Longitude field</label> \
+          <label for="form-field-lon-field">Longitude field</label> \
           <div class="input editor-lon-field"> \
-            <select class="form-control"> \
+            <select id="form-field-lon-field" class="form-control"> \
             <option value=""></option> \
             {{#fields}} \
             <option value="{{id}}">{{label}}</option> \
diff --git a/src/widget.filtereditor.js b/src/widget.filtereditor.js
index 15880fef..62a153e9 100644
--- a/src/widget.filtereditor.js
+++ b/src/widget.filtereditor.js
@@ -14,16 +14,16 @@ my.FilterEditor = Backbone.View.extend({
       <a href="#" class="js-add-filter">Add filter</a> \
       <form class="form-stacked js-add" style="display: none;"> \
         <div class="form-group"> \
-          <label>Field</label> \
-          <select class="fields form-control"> \
+          <label for="form-field-add-field">Field</label> \
+          <select id="form-field-add-field" class="fields form-control"> \
             {{#fields}} \
             <option value="{{id}}">{{label}}</option> \
             {{/fields}} \
           </select> \
         </div> \
         <div class="form-group"> \
-          <label>Filter type</label> \
-          <select class="filterType form-control"> \
+          <label for="form-field-filter-type">Filter type</label> \
+          <select id="form-field-filter-type" class="filterType form-control"> \
             <option value="term">Value</option> \
             <option value="range">Range</option> \
             <option value="geo_distance">Geo distance</option> \