diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-results.tt
index 5b64256ded..7ad9872839 100644
--- a/koha-tt/opac-tmpl/prog/en/modules/opac-results.tt
+++ b/koha-tt/opac-tmpl/prog/en/modules/opac-results.tt
@@ -377,8 +377,8 @@ $(document).ready(function(){
             [% END %]
 
                 <td class="select selectcol">[% IF ( SEARCH_RESULT.opacbookbag ) %]<input type="checkbox" id="bib[% SEARCH_RESULT.biblionumber %]" name="biblionumber" value="[% SEARCH_RESULT.biblionumber %]" /> <label for="bib[% SEARCH_RESULT.biblionumber %]"></label>[% ELSE %]
-[% IF ( SEARCH_RESULT.virtualshelves ) %]<input type="checkbox" id="bib[% SEARCH_RESULT.biblionumber %]" name="biblionumber" value="[% SEARCH_RESULT.biblionumber %]" /> <label for="bib[% SEARCH_RESULT.biblionumber %]"></label>[% ELSE %]
-[% IF ( SEARCH_RESULT.RequestOnOpac ) %][% UNLESS ( SEARCH_RESULT.norequests ) %][% IF ( SEARCH_RESULT.opacuserlogin ) %]<input type="checkbox" id="bib[% SEARCH_RESULT.biblionumber %]" name="biblionumber" value="[% SEARCH_RESULT.biblionumber %]" /> <label for="bib[% SEARCH_RESULT.biblionumber %]"></label>[% END %][% END %][% END %][% END %][% END %]</td>
+[% IF ( virtualshelves ) %]<input type="checkbox" id="bib[% SEARCH_RESULT.biblionumber %]" name="biblionumber" value="[% SEARCH_RESULT.biblionumber %]" /> <label for="bib[% SEARCH_RESULT.biblionumber %]"></label>[% ELSE %]
+[% IF ( RequestOnOpac ) %][% UNLESS ( SEARCH_RESULT.norequests ) %][% IF ( SEARCH_RESULT.opacuserlogin ) %]<input type="checkbox" id="bib[% SEARCH_RESULT.biblionumber %]" name="biblionumber" value="[% SEARCH_RESULT.biblionumber %]" /> <label for="bib[% SEARCH_RESULT.biblionumber %]"></label>[% END %][% END %][% END %][% END %][% END %]</td>
                 <td class="select selectcol">[% SEARCH_RESULT.result_number %].</td>
 
 				[% UNLESS ( item_level_itypes ) %]
@@ -401,13 +401,13 @@ $(document).ready(function(){
                 [% END %]
 
 				<td>
-                [% IF ( SEARCH_RESULT.COinSinOPACResults ) %]
+                [% IF ( COinSinOPACResults ) %]
                     [% IF ( SEARCH_RESULT.coins ) %]
                         <!-- COinS / Openurl --><span class="Z3988" title="[% SEARCH_RESULT.coins %]"></span>
                     [% END %]
                 [% END %]
 
-				[% IF ( SEARCH_RESULT.OPACXSLTResultsDisplay ) %]
+				[% IF ( OPACXSLTResultsDisplay ) %]
                 [% SEARCH_RESULT.XSLTResultsRecord %]
 				[% ELSE %]
 				[% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %]<a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber |url %]" title="View details for this title">
@@ -447,7 +447,7 @@ $(document).ready(function(){
                         [% available_items_loo.branchname %]
                     [% END %]
 
-                    [% IF ( available_items_loo.OPACItemsResultsDisplay ) %]
+                    [% IF ( OPACItemsResultsDisplay ) %]
 					    [% UNLESS ( available_items_loo.singleBranchMode ) %][% available_items_loo.location %][% END %]
                         [% IF ( available_items_loo.itemcallnumber ) %][<a href="/cgi-bin/koha/opac-search.pl?q=callnum:[% available_items_loo.itemcallnumber |url %]">[% available_items_loo.itemcallnumber %]</a>][% END %]
                     [% END %]
@@ -475,9 +475,9 @@ $(document).ready(function(){
                 </span>
 
 				[% END %]
-				[% IF ( SEARCH_RESULT.LibraryThingForLibrariesID ) %]<div class="ltfl_reviews"></div>[% END %]
-				[% IF ( SEARCH_RESULT.opacuserlogin ) %][% IF ( SEARCH_RESULT.TagsEnabled ) %]
-                                [% IF ( SEARCH_RESULT.TagsShowOnList ) %]
+				[% IF ( LibraryThingForLibrariesID ) %]<div class="ltfl_reviews"></div>[% END %]
+				[% IF ( opacuserlogin ) %][% IF ( TagsEnabled ) %]
+                                [% IF ( TagsShowOnList ) %]
                                 [% IF ( SEARCH_RESULT.TagLoop ) %]
                                     <div class="results_summary">
                                         <span class="label">Tags:</span>
@@ -485,8 +485,8 @@ $(document).ready(function(){
                                             [% END %]
                                         </ul>
                                    [% END %]
-                                [% IF ( SEARCH_RESULT.TagsInputOnList ) %]
-                                    [% IF ( SEARCH_RESULT.loggedinusername ) %]
+                                [% IF ( TagsInputOnList ) %]
+                                    [% IF ( loggedinusername ) %]
                                     <form name="tagform[% SEARCH_RESULT.biblionumber %]" method="post" action="/cgi-bin/koha/opac-tags.pl">
                                         <label for="newtag[% SEARCH_RESULT.biblionumber %]">New tag:</label>
                                         <input name="newtag[% SEARCH_RESULT.biblionumber %]" id="newtag[% SEARCH_RESULT.biblionumber %]" maxlength="100" />
@@ -505,10 +505,10 @@ $(document).ready(function(){
 				[% IF ( SEARCH_RESULT.searchhighlightblob ) %]<span class="results_summary"><span class="label">Match:</span> [% SEARCH_RESULT.searchhighlightblob %]</span>[% END %]
 
 <span class="results_summary actions"><span class="label">Actions:</span>
-                                [% IF ( SEARCH_RESULT.RequestOnOpac ) %]
+                                [% IF ( RequestOnOpac ) %]
 					[% UNLESS ( SEARCH_RESULT.norequests ) %]
-						[% IF ( SEARCH_RESULT.opacuserlogin ) %]
-							[% IF ( SEARCH_RESULT.AllowOnShelfHolds ) %]
+						[% IF ( opacuserlogin ) %]
+							[% IF ( AllowOnShelfHolds ) %]
 								<a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
 							[% ELSE %]
 								[% IF ( SEARCH_RESULT.itemsissued ) %]
@@ -520,15 +520,15 @@ $(document).ready(function(){
 				[% END %]
 
 
-				[% IF ( SEARCH_RESULT.opacuserlogin ) %][% IF ( SEARCH_RESULT.loggedinusername ) %][% IF ( SEARCH_RESULT.virtualshelves ) %]<a class="addtoshelf" href="/cgi-bin/koha/opac-addbybiblionumber.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]" onclick="Dopop('opac-addbybiblionumber.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]'); return false;">Save to Lists</a>
+				[% IF ( opacuserlogin ) %][% IF ( loggedinusername ) %][% IF ( virtualshelves ) %]<a class="addtoshelf" href="/cgi-bin/koha/opac-addbybiblionumber.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]" onclick="Dopop('opac-addbybiblionumber.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]'); return false;">Save to Lists</a>
     			[% END %][% END %][% END %]
-        		[% IF ( SEARCH_RESULT.opacbookbag ) %]<a class="addtocart" href="#" onclick="addRecord('[% SEARCH_RESULT.biblionumber %]'); return false;">Add to Cart</a>[% END %]
+        		[% IF ( opacbookbag ) %]<a class="addtocart" href="#" onclick="addRecord('[% SEARCH_RESULT.biblionumber %]'); return false;">Add to Cart</a>[% END %]
 				</span>
 				</td><td>
 					<a class="p1" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">
-                    [% IF ( SEARCH_RESULT.OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %]<img src="http://images.amazon.com/images/P/[% SEARCH_RESULT.normalized_isbn %].01.TZZZZZZZ.jpg" alt="" class="thumbnail" />[% ELSE %]<span class="no-image">No cover image available</span>[% END %][% END %][% END %]
+                    [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %]<img src="http://images.amazon.com/images/P/[% SEARCH_RESULT.normalized_isbn %].01.TZZZZZZZ.jpg" alt="" class="thumbnail" />[% ELSE %]<span class="no-image">No cover image available</span>[% END %][% END %][% END %]
 
-					[% IF ( SyndeticsEnabled ) %][% IF ( SEARCH_RESULT.SyndeticsCoverImages ) %][% IF ( SEARCH_RESULT.using_https ) %]
+					[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( using_https ) %]
                 <img src="https://secure.syndetics.com/index.aspx?isbn=[% SEARCH_RESULT.normalized_isbn %]/SC.GIF&amp;client=[% SEARCH_RESULT.SyndeticsClientCode %]&amp;type=xw10&amp;upc=[% SEARCH_RESULT.normalized_upc %]&amp;oclc=[% SEARCH_RESULT.normalized_oclc %]" alt="" class="thumbnail" />
                 [% ELSE %]
                 <img src="http://www.syndetics.com/index.aspx?isbn=[% SEARCH_RESULT.normalized_isbn %]/SC.GIF&amp;client=[% SEARCH_RESULT.SyndeticsClientCode %]&amp;type=xw10&amp;upc=[% SEARCH_RESULT.normalized_upc %]&amp;oclc=[% SEARCH_RESULT.normalized_oclc %]" alt="" class="thumbnail" />[% END %][% END %][% END %]