diff --git a/package.json b/package.json
index ad930ee5..eae7d7f7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jQuery-QueryBuilder",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "author": {
     "name": "Damien \"Mistic\" Sorel",
     "email": "contact@git.strangeplanet.fr",
diff --git a/src/template.js b/src/template.js
index c01d43d1..2885750b 100644
--- a/src/template.js
+++ b/src/template.js
@@ -1,4 +1,5 @@
-QueryBuilder.templates.group = '\
+QueryBuilder.templates.group =
+    '\
 <div id="{{= it.group_id }}" class="rules-group-container"> \
   <div class="rules-group-header"> \
     <div class="btn-group pull-right group-actions"> \
@@ -32,7 +33,8 @@ QueryBuilder.templates.group = '\
   </div> \
 </div>';
 
-QueryBuilder.templates.rule = '\
+QueryBuilder.templates.rule =
+    '\
 <div id="{{= it.rule_id }}" class="rule-container"> \
   <div class="rule-header"> \
     <div class="btn-group pull-right rule-actions"> \
@@ -49,7 +51,8 @@ QueryBuilder.templates.rule = '\
   <div class="rule-value-container"></div> \
 </div>';
 
-QueryBuilder.templates.filterSelect = '\
+QueryBuilder.templates.filterSelect =
+    '\
 {{ var optgroup = null; }} \
 <select class="form-control" name="{{= it.rule.id }}_filter"> \
   {{? it.settings.display_empty_filter }} \
@@ -67,7 +70,8 @@ QueryBuilder.templates.filterSelect = '\
   {{? optgroup !== null }}</optgroup>{{?}} \
 </select>';
 
-QueryBuilder.templates.operatorSelect = '\
+QueryBuilder.templates.operatorSelect =
+    '\
 {{? it.operators.length === 1 }} \
 <span> \
 {{= it.translate("operators", it.operators[0].type) }} \
@@ -87,7 +91,8 @@ QueryBuilder.templates.operatorSelect = '\
   {{? optgroup !== null }}</optgroup>{{?}} \
 </select>';
 
-QueryBuilder.templates.ruleValueSelect = '\
+QueryBuilder.templates.ruleValueSelect =
+    '\
 {{ var optgroup = null; }} \
 <select class="form-control" name="{{= it.name }}" {{? it.rule.filter.multiple }}multiple{{?}}> \
   {{? it.rule.filter.placeholder }} \
@@ -121,7 +126,7 @@ QueryBuilder.prototype.getGroupTemplate = function(group_id, level) {
         conditions: this.settings.conditions,
         icons: this.icons,
         settings: this.settings,
-        translate: this.translate.bind(this)
+        translate: this.translate.bind(this),
     });
 
     /**
@@ -132,7 +137,7 @@ QueryBuilder.prototype.getGroupTemplate = function(group_id, level) {
      * @param {int} level
      * @returns {string}
      */
-    return this.change('getGroupTemplate', h, level);
+    return this.change("getGroupTemplate", h, level);
 };
 
 /**
@@ -148,7 +153,7 @@ QueryBuilder.prototype.getRuleTemplate = function(rule_id) {
         rule_id: rule_id,
         icons: this.icons,
         settings: this.settings,
-        translate: this.translate.bind(this)
+        translate: this.translate.bind(this),
     });
 
     /**
@@ -158,7 +163,7 @@ QueryBuilder.prototype.getRuleTemplate = function(rule_id) {
      * @param {string} html
      * @returns {string}
      */
-    return this.change('getRuleTemplate', h);
+    return this.change("getRuleTemplate", h);
 };
 
 /**
@@ -176,7 +181,7 @@ QueryBuilder.prototype.getRuleFilterSelect = function(rule, filters) {
         filters: filters,
         icons: this.icons,
         settings: this.settings,
-        translate: this.translate.bind(this)
+        translate: this.translate.bind(this),
     });
 
     /**
@@ -188,7 +193,7 @@ QueryBuilder.prototype.getRuleFilterSelect = function(rule, filters) {
      * @param {QueryBuilder.Filter[]} filters
      * @returns {string}
      */
-    return this.change('getRuleFilterSelect', h, rule, filters);
+    return this.change("getRuleFilterSelect", h, rule, filters);
 };
 
 /**
@@ -206,7 +211,7 @@ QueryBuilder.prototype.getRuleOperatorSelect = function(rule, operators) {
         operators: operators,
         icons: this.icons,
         settings: this.settings,
-        translate: this.translate.bind(this)
+        translate: this.translate.bind(this),
     });
 
     /**
@@ -218,7 +223,7 @@ QueryBuilder.prototype.getRuleOperatorSelect = function(rule, operators) {
      * @param {QueryBuilder.Operator[]} operators
      * @returns {string}
      */
-    return this.change('getRuleOperatorSelect', h, rule, operators);
+    return this.change("getRuleOperatorSelect", h, rule, operators);
 };
 
 /**
@@ -236,7 +241,7 @@ QueryBuilder.prototype.getRuleValueSelect = function(name, rule) {
         rule: rule,
         icons: this.icons,
         settings: this.settings,
-        translate: this.translate.bind(this)
+        translate: this.translate.bind(this),
     });
 
     /**
@@ -248,7 +253,7 @@ QueryBuilder.prototype.getRuleValueSelect = function(name, rule) {
      * @param {Rule} rule
      * @returns {string}
      */
-    return this.change('getRuleValueSelect', h, name, rule);
+    return this.change("getRuleValueSelect", h, name, rule);
 };
 
 /**
@@ -262,53 +267,79 @@ QueryBuilder.prototype.getRuleValueSelect = function(name, rule) {
 QueryBuilder.prototype.getRuleInput = function(rule, value_id) {
     var filter = rule.filter;
     var validation = rule.filter.validation || {};
-    var name = rule.id + '_value_' + value_id;
-    var c = filter.vertical ? ' class=block' : '';
-    var h = '';
+    var name = rule.id + "_value_" + value_id;
+    var c = filter.vertical ? " class=block" : "";
+    var h = "";
 
-    if (typeof filter.input == 'function') {
+    if (typeof filter.input == "function") {
         h = filter.input.call(this, rule, name);
-    }
-    else {
+    } else {
         switch (filter.input) {
-            case 'radio':
-            case 'checkbox':
+            case "radio":
+            case "checkbox":
                 Utils.iterateOptions(filter.values, function(key, val) {
-                    h += '<label' + c + '><input type="' + filter.input + '" name="' + name + '" value="' + key + '"> ' + val + '</label> ';
+                    h +=
+                        "<label" +
+                        c +
+                        '><input type="' +
+                        filter.input +
+                        '" name="' +
+                        name +
+                        '" value="' +
+                        key +
+                        '"><span>' +
+                        val +
+                        "</span></label> ";
                 });
                 break;
 
-            case 'select':
+            case "select":
                 h = this.getRuleValueSelect(name, rule);
                 break;
 
-            case 'textarea':
+            case "textarea":
                 h += '<textarea class="form-control" name="' + name + '"';
                 if (filter.size) h += ' cols="' + filter.size + '"';
                 if (filter.rows) h += ' rows="' + filter.rows + '"';
-                if (validation.min !== undefined) h += ' minlength="' + validation.min + '"';
-                if (validation.max !== undefined) h += ' maxlength="' + validation.max + '"';
-                if (filter.placeholder) h += ' placeholder="' + filter.placeholder + '"';
-                h += '></textarea>';
+                if (validation.min !== undefined)
+                    h += ' minlength="' + validation.min + '"';
+                if (validation.max !== undefined)
+                    h += ' maxlength="' + validation.max + '"';
+                if (filter.placeholder)
+                    h += ' placeholder="' + filter.placeholder + '"';
+                h += "></textarea>";
                 break;
 
-            case 'number':
-                h += '<input class="form-control" type="number" name="' + name + '"';
-                if (validation.step !== undefined) h += ' step="' + validation.step + '"';
-                if (validation.min !== undefined) h += ' min="' + validation.min + '"';
-                if (validation.max !== undefined) h += ' max="' + validation.max + '"';
-                if (filter.placeholder) h += ' placeholder="' + filter.placeholder + '"';
+            case "number":
+                h +=
+                    '<input class="form-control" type="number" name="' +
+                    name +
+                    '"';
+                if (validation.step !== undefined)
+                    h += ' step="' + validation.step + '"';
+                if (validation.min !== undefined)
+                    h += ' min="' + validation.min + '"';
+                if (validation.max !== undefined)
+                    h += ' max="' + validation.max + '"';
+                if (filter.placeholder)
+                    h += ' placeholder="' + filter.placeholder + '"';
                 if (filter.size) h += ' size="' + filter.size + '"';
-                h += '>';
+                h += ">";
                 break;
 
             default:
-                h += '<input class="form-control" type="text" name="' + name + '"';
-                if (filter.placeholder) h += ' placeholder="' + filter.placeholder + '"';
-                if (filter.type === 'string' && validation.min !== undefined) h += ' minlength="' + validation.min + '"';
-                if (filter.type === 'string' && validation.max !== undefined) h += ' maxlength="' + validation.max + '"';
+                h +=
+                    '<input class="form-control" type="text" name="' +
+                    name +
+                    '"';
+                if (filter.placeholder)
+                    h += ' placeholder="' + filter.placeholder + '"';
+                if (filter.type === "string" && validation.min !== undefined)
+                    h += ' minlength="' + validation.min + '"';
+                if (filter.type === "string" && validation.max !== undefined)
+                    h += ' maxlength="' + validation.max + '"';
                 if (filter.size) h += ' size="' + filter.size + '"';
-                h += '>';
+                h += ">";
         }
     }
 
@@ -321,5 +352,5 @@ QueryBuilder.prototype.getRuleInput = function(rule, value_id) {
      * @param {string} name - the name that the input must have
      * @returns {string}
      */
-    return this.change('getRuleInput', h, rule, name);
+    return this.change("getRuleInput", h, rule, name);
 };