diff --git a/css/light-grey.css b/css/light-grey.css
index 42bd00550..0dd9c0601 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -342,10 +342,10 @@ a.small_action {
   padding-left: 5px;
   padding-top: 2px;
   padding-bottom: 2px;
-  background: #ea7d1e url(../images/actions_left.png?v=v2.6.0-beta) no-repeat left;
+  background: #ea7d1e url(../images/actions_left.png?v=v2.6.0) no-repeat left;
 }
 .actions_details span {
-  background: url(../images/actions_right.png?v=v2.6.0-beta) no-repeat right;
+  background: url(../images/actions_right.png?v=v2.6.0) no-repeat right;
   color: #fff;
   font-weight: bold;
   padding-top: 2px;
@@ -519,7 +519,7 @@ div.actions_menu > ul {
   nowidth: 70px;
   padding-left: 5px;
   /* Nasty work-around for IE... en attendant mieux */
-  background: #ea7d1e url(../images/actions_left.png?v=v2.6.0-beta) no-repeat top left;
+  background: #ea7d1e url(../images/actions_left.png?v=v2.6.0) no-repeat top left;
   cursor: pointer;
   margin: 0;
 }
@@ -531,7 +531,7 @@ div.actions_menu > ul > li {
   height: 17px;
   padding-right: 16px;
   padding-left: 4px;
-  background: url(../images/actions_right.png?v=v2.6.0-beta) no-repeat top right transparent;
+  background: url(../images/actions_right.png?v=v2.6.0) no-repeat top right transparent;
   font-weight: bold;
   color: #fff;
   vertical-align: middle;
@@ -677,7 +677,7 @@ td a.dp-choose-date, a.dp-choose-date, td a.dp-choose-date:hover, a.dp-choose-da
   display: block;
   text-indent: -2000px;
   overflow: hidden;
-  background: url(../images/calendar.png?v=v2.6.0-beta) no-repeat;
+  background: url(../images/calendar.png?v=v2.6.0) no-repeat;
 }
 td a.dp-choose-date.dp-disabled, a.dp-choose-date.dp-disabled {
   background-position: 0 -20px;
@@ -977,6 +977,7 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group {
   /* Form group (operators) is displayed only when the criteria is toggled to opened state */
   display: none;
+  max-width: 450px;
   max-height: 520px;
   overflow: auto;
   /* Show only first operator in simple mode */
@@ -1330,19 +1331,19 @@ input.dp-applied {
 }
 /* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */
 table.listResults tr.odd td.truncated, table.listResults tr td.truncated, .wizContainer table.listResults tr.odd td.truncated, .wizContainer table.listResults tr td.truncated {
-  background: url(../images/truncated.png?v=v2.6.0-beta) bottom repeat-x;
+  background: url(../images/truncated.png?v=v2.6.0) bottom repeat-x;
 }
 /* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */
 table.listResults tr.even td.truncated, .wizContainer table.listResults tr.even td.truncated {
-  background: #f9f9f1 url(../images/truncated.png?v=v2.6.0-beta) bottom repeat-x;
+  background: #f9f9f1 url(../images/truncated.png?v=v2.6.0) bottom repeat-x;
 }
 /* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */
 table.listResults tr.even td.hover.truncated, .wizContainer table.listResults tr.even td.hover.truncated {
-  background: #fdf5d0 url(../images/truncated.png?v=v2.6.0-beta) bottom repeat-x;
+  background: #fdf5d0 url(../images/truncated.png?v=v2.6.0) bottom repeat-x;
 }
 /* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */
 table.listResults tr.odd td.hover.truncated, table.listResults tr td.hover.truncated, .wizContainer table.listResults tr.odd td.hover.truncated, .wizContainer table.listResults tr td.hover.truncated {
-  background: #fdf5d0 url(../images/truncated.png?v=v2.6.0-beta) bottom repeat-x;
+  background: #fdf5d0 url(../images/truncated.png?v=v2.6.0) bottom repeat-x;
 }
 table.listResults.truncated {
   border-bottom: 0;
@@ -1450,7 +1451,7 @@ div#logo {
 div#logo div {
   height: 88px;
   width: 244px;
-  background: url(../images/itop-logo-2.png?v=v2.6.0-beta) left no-repeat;
+  background: url(../images/itop-logo-2.png?v=v2.6.0) left no-repeat;
 }
 #left-pane .ui-layout-north {
   overflow: hidden;
@@ -1542,7 +1543,7 @@ div#logo div {
 }
 #global-search-image {
   vertical-align: middle;
-  background: url(../images/search.png?v=v2.6.0-beta) center center no-repeat;
+  background: url(../images/search.png?v=v2.6.0) center center no-repeat;
   display: inline-block;
   width: 28px;
   height: 30px;
@@ -1571,7 +1572,7 @@ span.ui-icon {
   margin: 0 2px;
 }
 .ui-layout-button-pin-down {
-  background: url(../images/splitter-bkg.png?v=v2.6.0-beta) transparent;
+  background: url(../images/splitter-bkg.png?v=v2.6.0) transparent;
   width: 16px;
   background-position: -144px -144px;
 }
@@ -2087,7 +2088,7 @@ img.prev, img.first, img.next, img.last {
 }
 div.actions_button {
   float: right;
-  background: #ea7d1e url("../images/actions_left.png?v=v2.6.0-beta") no-repeat scroll left top;
+  background: #ea7d1e url("../images/actions_left.png?v=v2.6.0") no-repeat scroll left top;
   padding-left: 5px;
   margin-top: 0;
   margin-right: 10px;
@@ -2095,7 +2096,7 @@ div.actions_button {
   vertical-align: middle;
 }
 div.actions_button a, .actions_button a:hover, .actions_button a:visited {
-  background: #ea7d1e url(../images/actions_bkg.png?v=v2.6.0-beta) no-repeat scroll right top;
+  background: #ea7d1e url(../images/actions_bkg.png?v=v2.6.0) no-repeat scroll right top;
   color: #fff;
   padding-right: 8px;
   cursor: pointer;
@@ -2119,10 +2120,10 @@ select#org_id {
   cursor: not-allowed;
 }
 .dragHover {
-  background: url(./ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=v2.6.0-beta);
+  background: url(./ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=v2.6.0);
 }
 .edit_mode .dashlet {
-  background: url(./ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=v2.6.0-beta);
+  background: url(./ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=v2.6.0);
   padding: 5px;
   margin: 0;
   position: relative;
@@ -2156,7 +2157,7 @@ table.prop_table {
   top: 0;
   right: 0;
   z-index: 10;
-  background: transparent url(../images/delete.png?v=v2.6.0-beta) no-repeat center;
+  background: transparent url(../images/delete.png?v=v2.6.0) no-repeat center;
 }
 td.prop_value {
   text-align: left;
@@ -2377,17 +2378,17 @@ a.summary, a.summary:hover {
 }
 .message_info {
   border: 1px solid #993;
-  background: url(../images/info-mini.png?v=v2.6.0-beta) 1em 1em no-repeat #ffc;
+  background: url(../images/info-mini.png?v=v2.6.0) 1em 1em no-repeat #ffc;
   padding-left: 3em;
 }
 .message_ok {
   border: 1px solid #393;
-  background: url(../images/ok.png?v=v2.6.0-beta) 1em 1em no-repeat #cfc;
+  background: url(../images/ok.png?v=v2.6.0) 1em 1em no-repeat #cfc;
   padding-left: 3em;
 }
 .message_error {
   border: 1px solid #933;
-  background: url(../images/error.png?v=v2.6.0-beta) 1em 1em no-repeat #fcc;
+  background: url(../images/error.png?v=v2.6.0) 1em 1em no-repeat #fcc;
   padding-left: 3em;
 }
 .fg-menu a img {
@@ -2518,18 +2519,18 @@ div.explain-printable {
 }
 #hiddeable_chapters .ui-tabs .ui-tabs-nav li.hideable-chapter span {
   padding-left: 20px;
-  background: url(../images/eye-open-555.png?v=v2.6.0-beta) 2px center no-repeat;
+  background: url(../images/eye-open-555.png?v=v2.6.0) 2px center no-repeat;
 }
 #hiddeable_chapters .ui-tabs .ui-tabs-nav li.hideable-chapter.strikethrough span {
   text-decoration: line-through;
-  background: url(../images/eye-closed-555.png?v=v2.6.0-beta) 2px center no-repeat;
+  background: url(../images/eye-closed-555.png?v=v2.6.0) 2px center no-repeat;
 }
 .printable-version legend {
   padding-left: 26px;
-  background: #1c94c4 url(../images/eye-open-fff.png?v=v2.6.0-beta) 8px center no-repeat;
+  background: #1c94c4 url(../images/eye-open-fff.png?v=v2.6.0) 8px center no-repeat;
 }
 .printable-version .strikethrough legend {
-  background: #1c94c4 url(../images/eye-closed-fff.png?v=v2.6.0-beta) 8px center no-repeat;
+  background: #1c94c4 url(../images/eye-closed-fff.png?v=v2.6.0) 8px center no-repeat;
 }
 .printable-version fieldset.strikethrough span {
   display: none;
@@ -2680,7 +2681,7 @@ span.search-button, span.refresh-button {
 #itop-breadcrumb .breadcrumb-item a::after {
   content: '';
   position: absolute;
-  background-image: url(../images/breadcrumb-separator.png?v=v2.6.0-beta);
+  background-image: url(../images/breadcrumb-separator.png?v=v2.6.0);
   background-repeat: no-repeat;
   width: 8px;
   height: 16px;
diff --git a/css/light-grey.scss b/css/light-grey.scss
index b159f2380..553f0f8db 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -1106,6 +1106,7 @@ input.dp-applied {
 			.sfc_form_group{
 				/* Form group (operators) is displayed only when the criteria is toggled to opened state */
 				display: none;
+				max-width: 450px;
 				max-height: 520px;
 				overflow: auto;
 
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index bd2df0e76..b7aa40814 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -760,7 +760,8 @@ $(function()
 			var aValues = [];
 			for(var iValueIdx in aRawValues)
 			{
-				aValues.push(aRawValues[iValueIdx].label);
+				var sEscapedLabel = $('<div />').text(aRawValues[iValueIdx].label).html();
+				aValues.push(sEscapedLabel);
 			}
 
 			return aValues.join(', ');
diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
index 6b04589de..0f64ceb6e 100644
--- a/js/search/search_form_criteria_enum.js
+++ b/js/search/search_form_criteria_enum.js
@@ -829,10 +829,11 @@ $(function()
 		// - Make a jQuery element for a list item
 		_makeListItemElement: function(sLabel, sValue, bInitChecked, bInitHidden)
 		{
+			var sEscapedLabel = $('<div />').text(sLabel).html();
 			var oItemElem = $('<div></div>')
 				.addClass('sfc_opc_mc_item')
 				.attr('data-value-code', sValue)
-				.append('<label><input type="checkbox" value="'+sValue+'"/>'+sLabel+'</label>');
+				.append('<label><input type="checkbox" value="'+sValue+'"/>'+sEscapedLabel+'</label>');
 
 			if(bInitChecked === true)
 			{