diff --git a/koha-tt/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tt/intranet-tmpl/prog/en/includes/calendar.inc
index 43ba02268f..5a1deb1f16 100644
--- a/koha-tt/intranet-tmpl/prog/en/includes/calendar.inc
+++ b/koha-tt/intranet-tmpl/prog/en/includes/calendar.inc
@@ -48,7 +48,7 @@ Calendar._TT["DAY_FIRST"] = _("Display %s first");
 // This may be locale-dependent.  It specifies the week-end days, as an array
 // of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
 // means Monday, etc.
-Calendar._TT["WEEKEND"] = "0,6";
+Calendar._TT["WEEKEND"] = "0comma6";
 
 Calendar._TT["CLOSE"] = _("Close");
 Calendar._TT["TODAY"] = _("Today");
diff --git a/koha-tt/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tt/intranet-tmpl/prog/en/includes/patron-search.inc
index bea05105b2..caf439862b 100644
--- a/koha-tt/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tt/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -55,8 +55,8 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	[% END %]
     order by:
     <select name="orderby" id="searchorderby">
-    <option value="surname,0">Surname</option>
-    <option value="cardnumber,0">Cardnumber</option>
+    <option value="surnamecomma0">Surname</option>
+    <option value="cardnumbercomma0">Cardnumber</option>
     </select>
     <input value="Search" class="submit" type="submit" />
 	[% IF ( branchloop ) %]
diff --git a/koha-tt/intranet-tmpl/prog/en/includes/search_indexes.inc b/koha-tt/intranet-tmpl/prog/en/includes/search_indexes.inc
index aa140f22ca..84c73ba1b8 100644
--- a/koha-tt/intranet-tmpl/prog/en/includes/search_indexes.inc
+++ b/koha-tt/intranet-tmpl/prog/en/includes/search_indexes.inc
@@ -1,24 +1,24 @@
 <select class="advsearch" name="idx">
     <option value="kw">Keyword</option>
     <option value="au">Author</option>
-    <option value="au,phr">&nbsp;&nbsp;&nbsp;&nbsp; Author as Phrase</option>
+    <option value="aucommaphr">&nbsp;&nbsp;&nbsp;&nbsp; Author as Phrase</option>
     <option value="cpn">&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name</option>
     <option value="cfn">&nbsp;&nbsp;&nbsp;&nbsp; Conference Name</option>
-    <option value="cpn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name as Phrase</option>
-    <option value="cfn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Conference Name as Phrase</option>
+    <option value="cpncommaphr">&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name as Phrase</option>
+    <option value="cfncommaphr">&nbsp;&nbsp;&nbsp;&nbsp; Conference Name as Phrase</option>
     <option value="pn">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name</option>
-    <option value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name as Phrase</option>
+    <option value="pncommaphr">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name as Phrase</option>
     <option value="ti">Title</option>
-    <option value="ti,phr">&nbsp;&nbsp;&nbsp;&nbsp; Title as Phrase</option>
+    <option value="ticommaphr">&nbsp;&nbsp;&nbsp;&nbsp; Title as Phrase</option>
     <option value="se">&nbsp;&nbsp;&nbsp;&nbsp; Series Title</option>
     <option value="su">Subject</option>
-    <option value="su,phr">&nbsp;&nbsp;&nbsp;&nbsp; Subject as Phrase</option>
+    <option value="sucommaphr">&nbsp;&nbsp;&nbsp;&nbsp; Subject as Phrase</option>
     <option value="bc">Barcode</option>
     <option value="sn">Standard Number</option>
     <option value="nb">&nbsp;&nbsp;&nbsp;&nbsp; ISBN</option>
     <option value="ns">&nbsp;&nbsp;&nbsp;&nbsp; ISSN</option>
     <option value="callnum">&nbsp;&nbsp;&nbsp;&nbsp; Call Number</option>
-    <option value="ln,rtrn">Language</option>
+    <option value="lncommartrn">Language</option>
     <option value="nt">Notes/Comments</option>
     <option value="curriculum">Curriculum</option>
     <option value="pb">Publisher</option>
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/admin/aqbudget_owner_search.tt b/koha-tt/intranet-tmpl/prog/en/modules/admin/aqbudget_owner_search.tt
index 363ac49dd2..01fb9fe165 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/admin/aqbudget_owner_search.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/admin/aqbudget_owner_search.tt
@@ -35,7 +35,7 @@ function returnOwner(ownerId, ownerName){
 <!--
  Ordered by
 		<select name="orderby">
-			<option value="surname,firstname">Surname</option>
+			<option value="surnamecommafirstname">Surname</option>
 			<option value="cardnumber">Cardnumber</option>
 		</select>
 -->
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tt/intranet-tmpl/prog/en/modules/catalogue/results.tt
index 0dbea66193..36bf51aa2a 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -318,12 +318,12 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                         <label for="scan-index">Indexed in:</label>
                         <select name="idx" id="scan-index">
                             <option value="">Any Word</option>
-                            <option <!-- TMPL_IF NAME="ms_any,phr" --> selected="selected" [% END %] value="any,phr">Any Phrase</option>
+                            <option [% IF ( ms_anycommaphr ) %] selected="selected" [% END %] value="anycommaphr">Any Phrase</option>
                             <option [% IF ( ms_ti ) %] selected="selected" [% END %] value="ti">Title</option>
-                            <option <!-- TMPL_IF NAME="ms_ti,phr" --> selected="selected" [% END %] value="ti,phr">Title Phrase</option>
-                            <option <!-- TMPL_IF NAME="ms_au,phr" --> selected="selected" [% END %] value="au,phr">Author</option>
+                            <option [% IF ( ms_ticommaphr ) %] selected="selected" [% END %] value="ticommaphr">Title Phrase</option>
+                            <option [% IF ( ms_aucommaphr ) %] selected="selected" [% END %] value="aucommaphr">Author</option>
                             <option [% IF ( ms_su ) %] selected="selected" [% END %] value="su">Subject</option>
-                            <option <!-- TMPL_IF NAME="ms_su,phr" --> selected="selected" [% END %] value="su,phr">Subject Phrase</option>
+                            <option [% IF ( ms_sucommaphr ) %] selected="selected" [% END %] value="sucommaphr">Subject Phrase</option>
                             <option [% IF ( ms_se ) %] selected="selected" [% END %] value="se">Series</option>
                             <option [% IF ( ms_pb ) %] selected="selected" [% END %] value="pb">Publisher</option>
                             <option [% IF ( ms_nt ) %] selected="selected" [% END %] value="nt">Notes</option>
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/edithelp.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/edithelp.tt
index 3a40f2d1f1..209c8329a3 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/edithelp.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/edithelp.tt
@@ -7,9 +7,9 @@ tinyMCE.init({
         theme : "advanced",
 	plugins : "table,save,advhr,advlink,iespell,searchreplace,print,contextmenu",
         theme_advanced_disable : "underline,strikethrough,styleselect,image",
-	theme_advanced_buttons1_add_before : "save,separator",
+	theme_advanced_buttons1_add_before : "savecommaseparator",
 	theme_advanced_buttons2_add_before: "cut,copy,paste,separator,search,replace,separator",
-	theme_advanced_buttons3_add_before : "tablecontrols,separator",
+	theme_advanced_buttons3_add_before : "tablecontrolscommaseparator",
 	theme_advanced_buttons3_add : "iespell,advhr,separator,print",
 	theme_advanced_toolbar_location : "top",
 	theme_advanced_toolbar_align : "left",
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/labels/search.tt b/koha-tt/intranet-tmpl/prog/en/modules/labels/search.tt
index 7aeac7f84b..07728dadb4 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/labels/search.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/labels/search.tt
@@ -41,8 +41,8 @@ to add to Batch [% batch_id %]
 [% IF ( selected ) %]<option value="ns" selected="selected">ISSN</option>
 [% ELSE %]<option value="ns">ISSN</option>[% END %]
 
-[% IF ( selected ) %]<option value="lcn,phr" selected="selected">Call Number</option>
-[% ELSE %]<option value="lcn,phr">Call Number</option>[% END %]
+[% IF ( selected ) %]<option value="lcncommaphr" selected="selected">Call Number</option>
+[% ELSE %]<option value="lcncommaphr">Call Number</option>[% END %]
 
 [% IF ( selected ) %]<option value="su" selected="selected">Subject</option>
 [% ELSE %]<option value="su">Subject</option>[% END %]
@@ -52,8 +52,8 @@ to add to Batch [% batch_id %]
 [% ELSE %]
    <option value="ti" selected="selected">Title</option>[% END %]
 
-[% IF ( selected ) %]<option value="ti,phr" selected="selected">Title Phrase</option>
-[% ELSE %]<option value="ti,phr">Title Phrase</option>[% END %]
+[% IF ( selected ) %]<option value="ticommaphr" selected="selected">Title Phrase</option>
+[% ELSE %]<option value="ticommaphr">Title Phrase</option>[% END %]
 
 [% IF ( selected ) %]<option value="se" selected="selected">Series Title</option>
 [% ELSE %]<option value="se">Series Title</option>[% END %]
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/members/guarantor_search.tt b/koha-tt/intranet-tmpl/prog/en/modules/members/guarantor_search.tt
index b5b7e5dcd2..cfb03c43cd 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/members/guarantor_search.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/members/guarantor_search.tt
@@ -51,7 +51,7 @@
 		<input type="hidden" name="category_type" id="category_type" value="[% category_type %]" />
 		<input type="text" name="member" id="member" value="[% member %]" class="focus" /> Ordered by
 		<select name="orderby">
-			<option value="surname,firstname">Surname</option>
+			<option value="surnamecommafirstname">Surname</option>
 			<option value="cardnumber">Cardnumber</option>
 		</select> <input type="submit" class="button" value="Search" /></fieldset>
 	</form>
diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-advsearch.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-advsearch.tt
index df5bae82a8..92eb8a5dd5 100644
--- a/koha-tt/opac-tmpl/prog/en/modules/opac-advsearch.tt
+++ b/koha-tt/opac-tmpl/prog/en/modules/opac-advsearch.tt
@@ -60,37 +60,37 @@
         [% IF ( search_boxes_loo.expanded_options ) %][% search_boxes_loo.left_content %][% END %] 
         <select name="idx">
             <option value="kw">Keyword</option>
-            <option value="su,wrdl">Subject</option>
+            <option value="sucommawrdl">Subject</option>
 [% IF ( search_boxes_loo.expanded_options ) %]
-            <option value="su,phr">&nbsp;&nbsp;&nbsp;&nbsp; Subject Phrase</option>
+            <option value="sucommaphr">&nbsp;&nbsp;&nbsp;&nbsp; Subject Phrase</option>
 [% END %]
             <option value="ti">Title</option>
 [% IF ( search_boxes_loo.expanded_options ) %]
-            <option value="ti,phr">&nbsp;&nbsp;&nbsp;&nbsp; Title Phrase</option>
-            <option value="se,wrdl">Series Title</option>
+            <option value="ticommaphr">&nbsp;&nbsp;&nbsp;&nbsp; Title Phrase</option>
+            <option value="secommawrdl">Series Title</option>
             <option value="callnum">Call Number</option>
 [% END %]
-            <option value="au,wrdl">Author</option>
+            <option value="aucommawrdl">Author</option>
             
 [% IF ( search_boxes_loo.expanded_options ) %]
-            <option value="au,phr">&nbsp;&nbsp;&nbsp;&nbsp; Author Phrase</option>
-            <option value="cpn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name</option>
-            <option value="cfn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Conference Name</option>
-            <option value="cfn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Conference Name Phrase</option>
-            <option value="pn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name</option>
-            <option value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name Phrase</option>
+            <option value="aucommaphr">&nbsp;&nbsp;&nbsp;&nbsp; Author Phrase</option>
+            <option value="cpncommawrdl">&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name</option>
+            <option value="cfncommawrdl">&nbsp;&nbsp;&nbsp;&nbsp; Conference Name</option>
+            <option value="cfncommaphr">&nbsp;&nbsp;&nbsp;&nbsp; Conference Name Phrase</option>
+            <option value="pncommawrdl">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name</option>
+            <option value="pncommaphr">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name Phrase</option>
 [% END %]
 [% IF ( search_boxes_loo.expanded_options ) %]
             <option value="nt">Notes/Comments</option>
             <option value="curriculum">Curriculum</option>
 [% END %]
-            <option value="pb,wrdl">Publisher</option>
-            <option value="pl,wrdl">Publisher Location</option>
+            <option value="pbcommawrdl">Publisher</option>
+            <option value="plcommawrdl">Publisher Location</option>
 [% IF ( search_boxes_loo.expanded_options ) %]
             <option value="sn">Standard Number</option>
             <option value="nb">&nbsp;&nbsp;&nbsp;&nbsp; ISBN</option>
             <option value="ns">&nbsp;&nbsp;&nbsp;&nbsp; ISSN</option>
-            <option value="lcn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Call Number</option>
+            <option value="lcncommaphr">&nbsp;&nbsp;&nbsp;&nbsp; Call Number</option>
 [% ELSE %]
             <option value="nb">ISBN</option>
 [% END %]