diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index aca7fe7b08..443257d583 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -117,7 +117,7 @@ $(function()
 			this.element
 				.append('<div class="sfc_title"></div>')
 				.append('<div class="sfc_form_group"></div>')
-				.append('<div class="sfc_toggle"><a class="fa fa-caret-down" href="#"></a></div>');
+				.append('<span class="sfc_toggle"><a class="fa fa-caret-down" href="#"></a></span>');
 
 			// Bind events
 			// - Toggler
@@ -128,7 +128,7 @@ $(function()
 			// Removable / locked decoration
 			if(this.options.is_removable === true)
 			{
-				this.element.append('<div class="sfc_close"><a class="fa fa-times" href="#"></a></div>');
+				this.element.append('<span class="sfc_close"><a class="fa fa-times" href="#"></a></span>');
 				this.element.find('.sfc_close').on('click', function(){
 					me._remove();
 				});
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 888867b8f6..5a226edab2 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -256,9 +256,12 @@ $(function()
 				var sWidgetClass = 'search_form_criteria' + '_' + sType;
 
 				// Add some informations from the field
-				oData.field = {
-					label: this.options.search.fields[sRef].label,
-				};
+				if(this._hasFieldDefinition(sRef))
+				{
+					oData.field = {
+						label: this.options.search.fields[sRef].label,
+					};
+				}
 
 				// Create DOM element
 				var oCriteriaElem = $('<div></div>')
@@ -308,6 +311,12 @@ $(function()
 			this._submit();
 		},
 
+		// Field helpers
+		_hasFieldDefinition: function(sRef)
+		{
+			return (this.options.search.fields[sRef] !== undefined);
+		},
+
 		// Button handlers
 		_onSubmitClick: function(oEvent)
 		{