diff --git a/templates/Recommend/SideFacets.phtml b/templates/Recommend/SideFacets.phtml
index 62a33bb..4d5990f 100755
--- a/templates/Recommend/SideFacets.phtml
+++ b/templates/Recommend/SideFacets.phtml
@@ -18,7 +18,7 @@
       }
     }
   ?>
-  <?if ($checkboxesShown):?>
+  <?php if ($checkboxesShown):?>
     <div class="checkboxFilter">
       <?=$this->context($this)->renderInContext('Recommend/SideFacets/checkbox-filters.phtml', ['checkboxFilters' => $checkboxFilters, 'results' => $results]); ?>
     </div>
diff --git a/templates/Recommend/SideFacets/cluster-list.phtml b/templates/Recommend/SideFacets/cluster-list.phtml
index d80e663..936013a 100755
--- a/templates/Recommend/SideFacets/cluster-list.phtml
+++ b/templates/Recommend/SideFacets/cluster-list.phtml
@@ -1,7 +1,7 @@
 <?php $idAndClass = 'id="more-narrowGroupHidden-'.$this->escapeHtmlAttr($this->title).'" class="facet narrow-toggle"'; ?>
 <?php $moreClass = 'narrowGroupHidden-'.$this->escapeHtmlAttr($this->title).' hidden'; ?>
 <?php foreach ($this->cluster['list'] as $i => $thisFacet): ?>
-  <?
+  <?php
     if(empty($thisFacet['displayText'])) {
       $thisFacet['displayText'] = "-";
     }
@@ -20,20 +20,20 @@
     <a <?=$idAndClass ?> href="<?=$moreUrl ?>" onclick="return moreFacets('narrowGroupHidden-<?=$this->escapeHtmlAttr($this->title) ?>')" rel="nofollow"><?=$this->transEsc('more')?> ...</a>
   <?php endif; ?>
 
-  <?
+  <?php
     $affectiveURL = $thisFacet['isApplied']
       ? $this->currentPath() . $results->getUrlQuery()->removeFacet($this->title, $thisFacet['value'], $thisFacet['operator'])
       : $this->currentPath() . $results->getUrlQuery()->addFacet($this->title, $thisFacet['value'], $thisFacet['operator']);
   ?>
   <?php if (!$thisFacet['isApplied'] && $this->allowExclude): ?>
-    <div class="facet excludable facet<?=$thisFacet['operator'] ?><?php if ($thisFacet['isApplied']): ?>active<?php endif; ?><?php if ($i >= $this->facets_before_more): ?> <?=$moreClass ?><?endif ?>">
+    <div class="facet excludable facet<?=$thisFacet['operator'] ?><?php if ($thisFacet['isApplied']): ?>active<?php endif; ?><?php if ($i >= $this->facets_before_more): ?> <?=$moreClass ?><?php endif ?>">
       <?php $excludeURL = $thisFacet['isApplied']
         ? $this->currentPath() . $results->getUrlQuery()->removeFacet($this->title, $thisFacet['value'], $thisFacet['operator'])->addFacet($this->title, $thisFacet['value'], 'NOT')
         : $this->currentPath() . $results->getUrlQuery()->addFacet($this->title, $thisFacet['value'], 'NOT');
       ?>
       <a href="<?=$excludeURL ?>" title="<?=$this->transEsc('exclude_facet') ?>" class="exclude"><i class="fa fa-times" aria-hidden="true"></i></a>
   <?php else: ?>
-    <a href="<?=$affectiveURL ?>" class="facet facet<?=$thisFacet['operator'] ?><?php if ($thisFacet['isApplied']): ?>active<?php endif; ?><?php if ($i >= $this->facets_before_more): ?> <?=$moreClass ?><?endif ?>">
+    <a href="<?=$affectiveURL ?>" class="facet facet<?=$thisFacet['operator'] ?><?php if ($thisFacet['isApplied']): ?>active<?php endif; ?><?php if ($i >= $this->facets_before_more): ?> <?=$moreClass ?><?php endif ?>">
   <?php endif; ?>
 
   <?php if ($thisFacet['isApplied']): ?>
diff --git a/templates/Recommend/SideFacets/range-slider.phtml b/templates/Recommend/SideFacets/range-slider.phtml
index ceab345..101e87f 100755
--- a/templates/Recommend/SideFacets/range-slider.phtml
+++ b/templates/Recommend/SideFacets/range-slider.phtml
@@ -20,7 +20,7 @@
 <?php if ($this->facet['type'] == 'date'): ?>
   <?php $this->headScript()->appendFile('vendor/bootstrap-slider.min.js'); ?>
   <?php $this->headLink()->appendStylesheet('vendor/bootstrap-slider.min.css'); ?>
-  <?
+  <?php
     $min = !empty($this->facet['values'][0]) ? min($this->facet['values'][0], 1400) : 1400;
     $future = date('Y', time()+31536000); // next year
     $max = !empty($this->facet['values'][1]) ? max($future, $this->facet['values'][1]) : $future;
diff --git a/templates/RecordDriver/SolrAuth/list-entry.phtml b/templates/RecordDriver/SolrAuth/list-entry.phtml
index e22e2df..10c3f91 100755
--- a/templates/RecordDriver/SolrAuth/list-entry.phtml
+++ b/templates/RecordDriver/SolrAuth/list-entry.phtml
@@ -10,7 +10,7 @@
     $user_id = $this->user ? $this->user->id : null;
   }
   // Thumbnail
-  $coverDetails = $this->record($this->driver)->getCoverDetails('list-entry', 'medium', $this->recordLink()->getUrl($this->driver));
+  $coverDetails = $this->record($this->driver)->getCoverDetails('list-entry', 'medium', $this->recordLinker($this->results)->getUrl($this->driver));
   $cover = $coverDetails['html'];
   $thumbnail = false;
   $thumbnailAlignment = $this->record($this->driver)->getThumbnailAlignment('list');
@@ -34,7 +34,7 @@
       <div class="result-body">
         <div class="resultItemLine1">
           <?php $missing = $this->driver instanceof \VuFind\RecordDriver\Missing; ?>
-          <?php if (!$missing): ?><a href="<?=$this->recordLink()->getUrl($this->driver)?>" class="getFull" data-view="<?=$this->params->getOptions()->getListViewOption() ?>"><?php endif; ?>
+          <?php if (!$missing): ?><a href="<?=$this->recordLinker($this->results)->getUrl($this->driver)?>" class="getFull" data-view="<?=$this->params->getOptions()->getListViewOption() ?>"><?php endif; ?>
             <span class="title"><?=$this->record($this->driver)->getTitleHtml()?></span>
           <?php if (!$missing): ?></a><?php endif; ?>
         </div>
diff --git a/templates/RecordDriver/SolrDefault/core.phtml b/templates/RecordDriver/SolrDefault/core.phtml
index 94f356f..0d841fc 100755
--- a/templates/RecordDriver/SolrDefault/core.phtml
+++ b/templates/RecordDriver/SolrDefault/core.phtml
@@ -65,7 +65,7 @@
       <p><?=$this->truncate($summary, 300)?></p>
 
       <?php if(strlen($summary) > 300): ?>
-        <p><a href='<?=$this->recordLink()->getTabUrl($this->driver, 'Description')?>#tabnav'><?=$this->transEsc('Full description')?></a></p>
+        <p><a href='<?=$this->recordLinker($this->results)->getTabUrl($this->driver, 'Description')?>#tabnav'><?=$this->transEsc('Full description')?></a></p>
       <?php endif; ?>
     <?php endif; ?>
 
diff --git a/templates/RecordDriver/SolrDefault/data-allRecordLinks.phtml b/templates/RecordDriver/SolrDefault/data-allRecordLinks.phtml
index fda9f90..af361e2 100755
--- a/templates/RecordDriver/SolrDefault/data-allRecordLinks.phtml
+++ b/templates/RecordDriver/SolrDefault/data-allRecordLinks.phtml
@@ -1,5 +1,5 @@
 <?php foreach ($data as $recordLink): ?>
-  <?php $link = str_replace("type=id","type=ctrlnum",$this->recordLink()->related($recordLink['link'])); ?>
+  <?php $link = str_replace("type=id","type=ctrlnum",$this->recordLinker($this->results)->related($recordLink['link'])); ?>
   <?=$this->transEsc($recordLink['title'])?>:
 <?php //  print_r($recordLink['link']); ?>
   <a href="<?= substr($link,0, -strlen("&jumpto=1")+1) ?>"><?=$this->escapeHtml($recordLink['value'])?></a><br />
diff --git a/templates/RecordDriver/SolrDefault/data-childRecords.phtml b/templates/RecordDriver/SolrDefault/data-childRecords.phtml
index 800e9a7..96ddefb 100755
--- a/templates/RecordDriver/SolrDefault/data-childRecords.phtml
+++ b/templates/RecordDriver/SolrDefault/data-childRecords.phtml
@@ -1 +1 @@
-<a href="<?=$this->recordLink()->getChildRecordSearchUrlByCtrlNum($this->driver)?>"><?=$this->transEsc('child_record_count', array('%%count%%' => $data))?></a>
+<a href="<?=$this->recordLinker($this->results)->getChildRecordSearchUrlByCtrlNum($this->driver)?>"><?=$this->transEsc('child_record_count', array('%%count%%' => $data))?></a>
diff --git a/templates/RecordDriver/SolrDefault/data-containerTitle.phtml b/templates/RecordDriver/SolrDefault/data-containerTitle.phtml
index 87078f9..e818466 100755
--- a/templates/RecordDriver/SolrDefault/data-containerTitle.phtml
+++ b/templates/RecordDriver/SolrDefault/data-containerTitle.phtml
@@ -4,7 +4,7 @@
   $containerVolume = $this->driver->getContainerVolume(); 
   $ref = $this->driver->getContainerReference();
   $link = $containerID
-    ? $this->recordLink()->getUrl("$containerSource|$containerID")
+    ? $this->recordLinker($this->results)->getUrl("$containerSource|$containerID")
     : $this->record($this->driver)->getLink('journaltitle', $data);
 ?>
 <a href="<?=$link?>"><?=$this->escapeHtml($data)?></a>
diff --git a/templates/RecordDriver/SolrDefault/format-list.phtml b/templates/RecordDriver/SolrDefault/format-list.phtml
index 8305414..89921f8 100755
--- a/templates/RecordDriver/SolrDefault/format-list.phtml
+++ b/templates/RecordDriver/SolrDefault/format-list.phtml
@@ -1,5 +1,5 @@
-<?php $c = count($this->driver->getFormatsFiltered()); ?>
-<?php foreach ($this->driver->getFormatsFiltered() as $format): ?>
+<?php $c = count($this->driver->getFormats()); ?>
+<?php foreach ($this->driver->getFormats() as $format): ?>
       <?php if (strlen($format)) : ?>
 	  <span class="format <?=$this->record($this->driver)->getFormatClass($format) ?>"><?=$this->transEsc($format) ?></span> 
       <?php endif ; ?>
diff --git a/templates/RecordDriver/SolrDefault/list-entry.phtml b/templates/RecordDriver/SolrDefault/list-entry.phtml
index e22e2df..10c3f91 100755
--- a/templates/RecordDriver/SolrDefault/list-entry.phtml
+++ b/templates/RecordDriver/SolrDefault/list-entry.phtml
@@ -10,7 +10,7 @@
     $user_id = $this->user ? $this->user->id : null;
   }
   // Thumbnail
-  $coverDetails = $this->record($this->driver)->getCoverDetails('list-entry', 'medium', $this->recordLink()->getUrl($this->driver));
+  $coverDetails = $this->record($this->driver)->getCoverDetails('list-entry', 'medium', $this->recordLinker($this->results)->getUrl($this->driver));
   $cover = $coverDetails['html'];
   $thumbnail = false;
   $thumbnailAlignment = $this->record($this->driver)->getThumbnailAlignment('list');
@@ -34,7 +34,7 @@
       <div class="result-body">
         <div class="resultItemLine1">
           <?php $missing = $this->driver instanceof \VuFind\RecordDriver\Missing; ?>
-          <?php if (!$missing): ?><a href="<?=$this->recordLink()->getUrl($this->driver)?>" class="getFull" data-view="<?=$this->params->getOptions()->getListViewOption() ?>"><?php endif; ?>
+          <?php if (!$missing): ?><a href="<?=$this->recordLinker($this->results)->getUrl($this->driver)?>" class="getFull" data-view="<?=$this->params->getOptions()->getListViewOption() ?>"><?php endif; ?>
             <span class="title"><?=$this->record($this->driver)->getTitleHtml()?></span>
           <?php if (!$missing): ?></a><?php endif; ?>
         </div>
diff --git a/templates/RecordDriver/SolrDefault/result-list.phtml b/templates/RecordDriver/SolrDefault/result-list.phtml
index 7d4ed9f..a4b1254 100755
--- a/templates/RecordDriver/SolrDefault/result-list.phtml
+++ b/templates/RecordDriver/SolrDefault/result-list.phtml
@@ -12,7 +12,7 @@
 
   //   $url = is_array($urls) ? $urls[0] : $urls;
 
-  $coverDetails = $this->record($this->driver)->getCoverDetails('result-list', 'medium', $this->recordLink()->getUrl($this->driver));
+  $coverDetails = $this->record($this->driver)->getCoverDetails('result-list', 'medium', $this->recordLinker($this->results)->getUrl($this->driver));
   $cover = $coverDetails['html'];
   $thumbnail = false;
   $data = $this->driver->getRawData(); 
@@ -61,7 +61,7 @@
   $thumbnailAlignment = $this->record($this->driver)->getThumbnailAlignment('result');
 
   // Collect data for the article requestform
-  $formatArray = $this->driver->getFormatsFiltered(); 
+  $formatArray = $this->driver->getFormats(); 
 
   (! in_array("Electronic resource", $formatArray) && (in_array("Journal article", $formatArray) || in_array("Paper in edited volumes", $formatArray))) ?  $displayRequestForm = 1 : $displayRequestForm = 0  ;
   if ($displayRequestForm == 1)  {
@@ -100,7 +100,7 @@
     <div class="result-body">
 
         <div class="title-container">
-            <a href="<?=$this->recordLink()->getUrl($this->driver)?>" class="title getFull" data-view="<?=$this->params->getOptions()->getListViewOption() ?>">
+            <a href="<?=$this->recordLinker($this->results)->getUrl($this->driver)?>" class="title getFull" data-view="<?=$this->params->getOptions()->getListViewOption() ?>">
             <?=$this->record($this->driver)->getTitleHtml()?>
 	    <?php $subTitle = $this->driver->getTitleSection(); ?>
             <?php if (!empty($subTitle)): ?>
@@ -193,7 +193,7 @@
             <?php $containerSource = $this->driver->getSourceIdentifier(); ?>
             <?php $containerID = $this->driver->getContainerRecordID(); ?>
             <?php /* TODO: handle highlighting more elegantly here: */?>
-            <a href="<?=($containerID ? $this->recordLink()->getUrl("$containerSource|$containerID") : $this->record($this->driver)->getLink('journaltitle', str_replace(array('{{{{START_HILITE}}}}', '{{{{END_HILITE}}}}'), '', $journalTitle)))?>"><?=$this->highlight($journalTitle) ?></a>
+            <a href="<?=($containerID ? $this->recordLinker($this->results)->getUrl("$containerSource|$containerID") : $this->record($this->driver)->getLink('journaltitle', str_replace(array('{{{{START_HILITE}}}}', '{{{{END_HILITE}}}}'), '', $journalTitle)))?>"><?=$this->highlight($journalTitle) ?></a>
             <?=!empty($summDate) ? ' (' . $this->escapeHtml($summDate[0]) . ')' : ''?>
           <?php elseif (!empty($summDate)): ?>
             <?=!empty($summAuthor) ? '<br />' : ''?>
@@ -231,14 +231,14 @@
           $i = 0;
           foreach ($dedupData as $source => $current) {
             if (++$i == 1) {
-              ?><span class="currentSource"><a href="<?=$this->recordLink()->getUrl($this->driver)?>"><?=$this->transEsc("source_$source", array(), $source)?></a></span><?
+              ?><span class="currentSource"><a href="<?=$this->recordLinker($this->results)->getUrl($this->driver)?>"><?=$this->transEsc("source_$source", array(), $source)?></a></span><?
             } else {
               if ($i == 2) {
                 ?> <span class="otherSources">(<?=$this->transEsc('Other Sources')?>: <?
               } else {
                 ?>, <?
               }
-              ?><a href="<?=$this->recordLink()->getUrl($current['id'])?>"><?=$this->transEsc("source_$source", array(), $source)?></a><?
+              ?><a href="<?=$this->recordLinker($this->results)->getUrl($current['id'])?>"><?=$this->transEsc("source_$source", array(), $source)?></a><?
             }
           }
           if ($i > 1) {
@@ -271,7 +271,7 @@
           <div class="favorites">
               <?php if ($this->userlist()->getMode() !== 'disabled'): ?>
                   <?php /* Add to favorites */ ?>
-                  <a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" data-lightbox class="save-record result-link-label" data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId()) ?>"><?=$this->transEsc('Add to favorites')?></a>
+                  <a href="<?=$this->recordLinker($this->results)->getActionUrl($this->driver, 'Save')?>" data-lightbox class="save-record result-link-label" data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId()) ?>"><?=$this->transEsc('Add to favorites')?></a>
                   <i class="result-link-icon fa fa-fw fa-star" aria-hidden="true"></i><br/>
                   <?php /* Saved lists */ ?>
                   <div class="savedLists">
@@ -307,7 +307,7 @@
                       <div class="hierarchyTreeLink">
                           <input type="hidden" value="<?=$this->escapeHtmlAttr($hierarchyID)?>" class="hiddenHierarchyId" />
 
-                          <a class="hierarchyTreeLinkText result-link-label" data-lightbox href="<?=$this->recordLink()->getTabUrl($this->driver, 'HierarchyTree')?>?hierarchy=<?=urlencode($hierarchyID)?>#tabnav" title="<?=$this->transEsc('hierarchy_tree')?>" data-lightbox-href="<?=$this->recordLink()->getTabUrl($this->driver, 'AjaxTab')?>?hierarchy=<?=urlencode($hierarchyID)?>" data-lightbox-post="tab=hierarchytree">
+                          <a class="hierarchyTreeLinkText result-link-label" data-lightbox href="<?=$this->recordLinker($this->results)->getTabUrl($this->driver, 'HierarchyTree')?>?hierarchy=<?=urlencode($hierarchyID)?>#tabnav" title="<?=$this->transEsc('hierarchy_tree')?>" data-lightbox-href="<?=$this->recordLinker($this->results)->getTabUrl($this->driver, 'AjaxTab')?>?hierarchy=<?=urlencode($hierarchyID)?>" data-lightbox-post="tab=hierarchytree">
                               <?=$this->transEsc('hierarchy_view_context')?><?php if (count($trees) > 1): ?>: <?=$this->escapeHtml($hierarchyTitle)?><?php endif; ?>
                           </a>
                           <i class="result-link-icon fa fa-fw fa-sitemap" aria-hidden="true"></i>
diff --git a/templates/RecordDriver/SolrDefault/toolbar.phtml b/templates/RecordDriver/SolrDefault/toolbar.phtml
index d46cf3b..acf9d75 100755
--- a/templates/RecordDriver/SolrDefault/toolbar.phtml
+++ b/templates/RecordDriver/SolrDefault/toolbar.phtml
@@ -25,7 +25,7 @@
 		if ($check) $link .= 'checkRequest ';
 		$link .= 'placehold" ' ; 
 		if (!empty($row['linkLightbox'])) $link .= 'data-lightbox ';  
-		$link .= "href=\""  .$this->recordLink()->getRequestUrl($row['link']) ."\">"; 
+		$link .= "href=\""  .$this->recordLinker($this->results)->getRequestUrl($row['link']) ."\">"; 
 		if ($check) { 
 			$link .= $this->transEsc("Check Hold") ;  
 		  } else {
@@ -42,7 +42,7 @@
 ?>
 
 <?php  // Collect data for the article requestform
-  $formatArray = $this->driver->getFormatsFiltered();
+  $formatArray = $this->driver->getFormats();
   (! in_array("Electronic resource", $formatArray) && (in_array("Journal article", $formatArray) || in_array("Paper in edited volumes", $formatArray))) ?  $displayRequestForm = 1 : $displayRequestForm = 0  ;
   if ($displayRequestForm == 1)  {
           if (in_array("Journal article", $formatArray)) $orderText = 'Artikel';
@@ -69,27 +69,27 @@
 <div id="suchauswahl" class="show-content suchauswahl hidden-print">
 <ul class="record-nav nav nav-pills hidden-print">
   <?php if (count($this->driver->getCitationFormats()) > 0): ?>
-    <li><a class="cite-record" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'Cite')?>" rel="nofollow"><i class="fa fa-asterisk" aria-hidden="true"></i> <?=$this->transEsc('Cite this')?></a></li>
+    <li><a class="cite-record" data-lightbox href="<?=$this->recordLinker($this->results)->getActionUrl($this->driver, 'Cite')?>" rel="nofollow"><i class="fa fa-asterisk" aria-hidden="true"></i> <?=$this->transEsc('Cite this')?></a></li>
   <?php endif; ?>
   <?php if ($this->accountCapabilities()->getSmsSetting() !== 'disabled'): ?>
-    <li><a class="sms-record" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'SMS')?>" rel="nofollow"><i class="fa fa-mobile" aria-hidden="true"></i> <?=$this->transEsc('Text this')?></a></li>
+    <li><a class="sms-record" data-lightbox href="<?=$this->recordLinker($this->results)->getActionUrl($this->driver, 'SMS')?>" rel="nofollow"><i class="fa fa-mobile" aria-hidden="true"></i> <?=$this->transEsc('Text this')?></a></li>
   <?php endif; ?>
-  <li><a class="mail-record" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'Email')?>" rel="nofollow"><i class="fa fa-envelope" aria-hidden="true"></i> <?=$this->transEsc('Email this')?></a></li>
+  <li><a class="mail-record" data-lightbox href="<?=$this->recordLinker($this->results)->getActionUrl($this->driver, 'Email')?>" rel="nofollow"><i class="fa fa-envelope" aria-hidden="true"></i> <?=$this->transEsc('Email this')?></a></li>
 
   <?php $exportFormats = $this->export()->getFormatsForRecord($this->driver); ?>
   <?php if(count($exportFormats) > 0): ?>
     <li class="dropdown">
-      <a class="export-toggle dropdown-toggle" data-toggle="dropdown" href="<?=$this->recordLink()->getActionUrl($this->driver, 'Export')?>" rel="nofollow"><i class="fa fa-list-alt" aria-hidden="true"></i> <?=$this->transEsc('Export Record') ?></a>
+      <a class="export-toggle dropdown-toggle" data-toggle="dropdown" href="<?=$this->recordLinker($this->results)->getActionUrl($this->driver, 'Export')?>" rel="nofollow"><i class="fa fa-list-alt" aria-hidden="true"></i> <?=$this->transEsc('Export Record') ?></a>
       <ul class="dropdown-menu" role="menu">
         <?php foreach ($exportFormats as $exportFormat): ?>
-          <li><a <?php if ($this->export()->needsRedirect($exportFormat)): ?>target="<?=$this->escapeHtmlAttr($exportFormat)?>Main" <?php endif; ?>href="<?=$this->recordLink()->getActionUrl($this->driver, 'Export')?>?style=<?=$this->escapeHtmlAttr($exportFormat)?>" rel="nofollow"><?=$this->transEsc('Export to')?> <?=$this->transEsc($this->export()->getLabelForFormat($exportFormat))?></a></li>
+          <li><a <?php if ($this->export()->needsRedirect($exportFormat)): ?>target="<?=$this->escapeHtmlAttr($exportFormat)?>Main" <?php endif; ?>href="<?=$this->recordLinker($this->results)->getActionUrl($this->driver, 'Export')?>?style=<?=$this->escapeHtmlAttr($exportFormat)?>" rel="nofollow"><?=$this->transEsc('Export to')?> <?=$this->transEsc($this->export()->getLabelForFormat($exportFormat))?></a></li>
         <?php endforeach; ?>
       </ul>
     </li>
   <?php endif; ?>
 
   <?php if ($this->userlist()->getMode() !== 'disabled'): ?>
-    <li><a class="save-record" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" rel="nofollow"><i class="fa fa-star" aria-hidden="true"></i> <?=$this->transEsc('Add to favorites')?></a></li>
+    <li><a class="save-record" data-lightbox href="<?=$this->recordLinker($this->results)->getActionUrl($this->driver, 'Save')?>" rel="nofollow"><i class="fa fa-star" aria-hidden="true"></i> <?=$this->transEsc('Add to favorites')?></a></li>
   <?php endif; ?>
   <?php if (!empty($addThis)): ?>
     <li><a class="addThis addthis_button" href="https://www.addthis.com/bookmark.php?v=250&amp;pub=<?=urlencode($addThis)?>"><i class="fa fa-bookmark" aria-hidden="true"></i> <?=$this->transEsc('Bookmark')?></a></li>
diff --git a/templates/RecordDriver/SolrDspace/core.phtml b/templates/RecordDriver/SolrDspace/core.phtml
index 794e49e..73abf2c 100755
--- a/templates/RecordDriver/SolrDspace/core.phtml
+++ b/templates/RecordDriver/SolrDspace/core.phtml
@@ -39,7 +39,7 @@
       <p><?=$this->truncate($summary, 300)?></p>
 
       <?php if(strlen($summary) > 300): ?>
-        <p><a href='<?=$this->recordLink()->getTabUrl($this->driver, 'Description')?>#tabnav'><?=$this->transEsc('Full description')?></a></p>
+        <p><a href='<?=$this->recordLinker($this->results)->getTabUrl($this->driver, 'Description')?>#tabnav'><?=$this->transEsc('Full description')?></a></p>
       <?php endif; ?>
     <?php endif; ?>
 
diff --git a/templates/RecordDriver/SolrDspace/result-list.phtml b/templates/RecordDriver/SolrDspace/result-list.phtml
index 994be64..abbbc95 100755
--- a/templates/RecordDriver/SolrDspace/result-list.phtml
+++ b/templates/RecordDriver/SolrDspace/result-list.phtml
@@ -1,5 +1,9 @@
 <?php
-  $coverDetails = $this->record($this->driver)->getCoverDetails('result-list', 'medium', $this->recordLink()->getUrl($this->driver));
+  $openUrl = $this->openUrl($this->driver, 'results');
+  $openUrlActive = $openUrl->isActive();
+  $urls = $this->record($this->driver)->getLinkDetails($openUrlActive);
+
+  $coverDetails = $this->record($this->driver)->getCoverDetails('result-list', 'medium', $this->recordLinker($this->results)->getUrl($this->driver));
   $cover = $coverDetails['html'];
   $thumbnail = false;
   $thumbnailAlignment = $this->record($this->driver)->getThumbnailAlignment('result');
@@ -23,7 +27,7 @@
     <div class="result-body">
 
         <div class="title-container">
-            <a href="<?=$this->recordLink()->getUrl($this->driver)?>" class="title getFull" data-view="<?=$this->params->getOptions()->getListViewOption() ?>">
+            <a href="<?=$this->recordLinker($this->results)->getUrl($this->driver)?>" class="title getFull" data-view="<?=$this->params->getOptions()->getListViewOption() ?>">
                 <?=$this->record($this->driver)->getTitleHtml()?>
             </a>
         </div>
@@ -85,7 +89,7 @@
             <?php $containerSource = $this->driver->getSourceIdentifier(); ?>
             <?php $containerID = $this->driver->getContainerRecordID(); ?>
             <?php /* TODO: handle highlighting more elegantly here: */?>
-            <a href="<?=($containerID ? $this->recordLink()->getUrl("$containerSource|$containerID") : $this->record($this->driver)->getLink('journaltitle', str_replace(array('{{{{START_HILITE}}}}', '{{{{END_HILITE}}}}'), '', $journalTitle)))?>"><?=$this->highlight($journalTitle) ?></a>
+            <a href="<?=($containerID ? $this->recordLinker($this->results)->getUrl("$containerSource|$containerID") : $this->record($this->driver)->getLink('journaltitle', str_replace(array('{{{{START_HILITE}}}}', '{{{{END_HILITE}}}}'), '', $journalTitle)))?>"><?=$this->highlight($journalTitle) ?></a>
             <?=!empty($summDate) ? ' (' . $this->escapeHtml($summDate[0]) . ')' : ''?>
           <?php elseif (!empty($summDate)): ?>
             <?=!empty($summAuthor) ? '<br />' : ''?>
@@ -115,26 +119,26 @@
         <?php endif; ?>
       <?php endif; ?>
 
-      <?
+      <?php
       /* Display information on duplicate records if available */
       if ($dedupData = $this->driver->getDedupData()): ?>
         <div class="dedupInformation">
-        <?
+        <?php
           $i = 0;
           foreach ($dedupData as $source => $current) {
             if (++$i == 1) {
-              ?><span class="currentSource"><a href="<?=$this->recordLink()->getUrl($this->driver)?>"><?=$this->transEsc("source_$source", array(), $source)?></a></span><?
+              ?><span class="currentSource"><a href="<?=$this->recordLinker($this->results)->getUrl($this->driver)?>"><?=$this->transEsc("source_$source", array(), $source)?></a></span><?php
             } else {
               if ($i == 2) {
-                ?> <span class="otherSources">(<?=$this->transEsc('Other Sources')?>: <?
+                ?> <span class="otherSources">(<?=$this->transEsc('Other Sources')?>: <?php
               } else {
-                ?>, <?
+                ?>; <?php 
               }
-              ?><a href="<?=$this->recordLink()->getUrl($current['id'])?>"><?=$this->transEsc("source_$source", array(), $source)?></a><?
+              ?><a href="<?=$this->recordLinker($this->results)->getUrl($current['id'])?>"><?=$this->transEsc("source_$source", array(), $source)?></a><?php
             }
           }
           if ($i > 1) {
-            ?>)</span><?
+            ?>)</span><?php
           }?>
         </div>
       <?php endif; ?>
@@ -177,7 +181,7 @@
           <div class="favorites">
               <?php if ($this->userlist()->getMode() !== 'disabled'): ?>
                   <?php /* Add to favorites */ ?>
-                  <a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" data-lightbox class="save-record result-link-label" data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId()) ?>"><?=$this->transEsc('Add to favorites')?></a>
+                  <a href="<?=$this->recordLinker($this->results)->getActionUrl($this->driver, 'Save')?>" data-lightbox class="save-record result-link-label" data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId()) ?>"><?=$this->transEsc('Add to favorites')?></a>
                   <i class="result-link-icon fa fa-fw fa-star" aria-hidden="true"></i><br/>
                   <?php /* Saved lists */ ?>
                   <div class="savedLists">
@@ -189,7 +193,7 @@
           <div class="result-links hidden-print">
               <?php /* Display qrcode if appropriate: */ ?>
               <?php if ($QRCode = $this->record($this->driver)->getQRCode("results")): ?>
-                  <?
+                  <?php
                   // Add JS Variables for QrCode
                   $this->jsTranslations()->addStrings(array('qrcode_hide' => 'qrcode_hide', 'qrcode_show' => 'qrcode_show'));
                   ?>
@@ -215,7 +219,7 @@
                       <div class="hierarchyTreeLink">
                           <input type="hidden" value="<?=$this->escapeHtmlAttr($hierarchyID)?>" class="hiddenHierarchyId" />
 
-                          <a class="hierarchyTreeLinkText result-link-label" data-lightbox href="<?=$this->recordLink()->getTabUrl($this->driver, 'HierarchyTree')?>?hierarchy=<?=urlencode($hierarchyID)?>#tabnav" title="<?=$this->transEsc('hierarchy_tree')?>" data-lightbox-href="<?=$this->recordLink()->getTabUrl($this->driver, 'AjaxTab')?>?hierarchy=<?=urlencode($hierarchyID)?>" data-lightbox-post="tab=hierarchytree">
+                          <a class="hierarchyTreeLinkText result-link-label" data-lightbox href="<?=$this->recordLinker($this->results)->getTabUrl($this->driver, 'HierarchyTree')?>?hierarchy=<?=urlencode($hierarchyID)?>#tabnav" title="<?=$this->transEsc('hierarchy_tree')?>" data-lightbox-href="<?=$this->recordLinker($this->results)->getTabUrl($this->driver, 'AjaxTab')?>?hierarchy=<?=urlencode($hierarchyID)?>" data-lightbox-post="tab=hierarchytree">
                               <?=$this->transEsc('hierarchy_view_context')?><?php if (count($trees) > 1): ?>: <?=$this->escapeHtml($hierarchyTitle)?><?php endif; ?>
                           </a>
                           <i class="result-link-icon fa fa-fw fa-sitemap" aria-hidden="true"></i>
@@ -229,5 +233,5 @@
   </div>
   <?php if ($thumbnail && $thumbnailAlignment == 'right'): ?>
     <?=$thumbnail ?>
-  <?php endif ?>
+  <?php endif; ?>
 </div>
diff --git a/templates/RecordDriver/SolrDspace/result-list.phtml.DMKZWO b/templates/RecordDriver/SolrDspace/result-list.phtml.DMKZWO
index c9b1e71..7c54c88 100755
--- a/templates/RecordDriver/SolrDspace/result-list.phtml.DMKZWO
+++ b/templates/RecordDriver/SolrDspace/result-list.phtml.DMKZWO
@@ -1,5 +1,5 @@
 <?php
-  $coverDetails = $this->record($this->driver)->getCoverDetails('result-list', 'medium', $this->recordLink()->getUrl($this->driver));
+  $coverDetails = $this->record($this->driver)->getCoverDetails('result-list', 'medium', $this->recordLinker($this->results)->getUrl($this->driver));
   $cover = $coverDetails['html'];
   $thumbnail = false;
   $thumbnailAlignment = $this->record($this->driver)->getThumbnailAlignment('result');
@@ -23,7 +23,7 @@
     <div class="result-body">
 
         <div class="title-container">
-            <a href="<?=$this->recordLink()->getUrl($this->driver)?>" class="title getFull" data-view="<?=$this->params->getOptions()->getListViewOption() ?>">
+            <a href="<?=$this->recordLinker($this->results)->getUrl($this->driver)?>" class="title getFull" data-view="<?=$this->params->getOptions()->getListViewOption() ?>">
                 <?=$this->record($this->driver)->getTitleHtml()?>
             </a>
         </div>
@@ -85,7 +85,7 @@
             <?php $containerSource = $this->driver->getSourceIdentifier(); ?>
             <?php $containerID = $this->driver->getContainerRecordID(); ?>
             <?php /* TODO: handle highlighting more elegantly here: */?>
-            <a href="<?=($containerID ? $this->recordLink()->getUrl("$containerSource|$containerID") : $this->record($this->driver)->getLink('journaltitle', str_replace(array('{{{{START_HILITE}}}}', '{{{{END_HILITE}}}}'), '', $journalTitle)))?>"><?=$this->highlight($journalTitle) ?></a>
+            <a href="<?=($containerID ? $this->recordLinker($this->results)->getUrl("$containerSource|$containerID") : $this->record($this->driver)->getLink('journaltitle', str_replace(array('{{{{START_HILITE}}}}', '{{{{END_HILITE}}}}'), '', $journalTitle)))?>"><?=$this->highlight($journalTitle) ?></a>
             <?=!empty($summDate) ? ' (' . $this->escapeHtml($summDate[0]) . ')' : ''?>
           <?php elseif (!empty($summDate)): ?>
             <?=!empty($summAuthor) ? '<br />' : ''?>
@@ -123,14 +123,14 @@
           $i = 0;
           foreach ($dedupData as $source => $current) {
             if (++$i == 1) {
-              ?><span class="currentSource"><a href="<?=$this->recordLink()->getUrl($this->driver)?>"><?=$this->transEsc("source_$source", array(), $source)?></a></span><?
+              ?><span class="currentSource"><a href="<?=$this->recordLinker($this->results)->getUrl($this->driver)?>"><?=$this->transEsc("source_$source", array(), $source)?></a></span><?
             } else {
               if ($i == 2) {
                 ?> <span class="otherSources">(<?=$this->transEsc('Other Sources')?>: <?
               } else {
                 ?>, <?
               }
-              ?><a href="<?=$this->recordLink()->getUrl($current['id'])?>"><?=$this->transEsc("source_$source", array(), $source)?></a><?
+              ?><a href="<?=$this->recordLinker($this->results)->getUrl($current['id'])?>"><?=$this->transEsc("source_$source", array(), $source)?></a><?
             }
           }
           if ($i > 1) {
@@ -170,7 +170,7 @@
           <div class="favorites">
               <?php if ($this->userlist()->getMode() !== 'disabled'): ?>
                   <?php /* Add to favorites */ ?>
-                  <a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" data-lightbox class="save-record result-link-label" data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId()) ?>"><?=$this->transEsc('Add to favorites')?></a>
+                  <a href="<?=$this->recordLinker($this->results)->getActionUrl($this->driver, 'Save')?>" data-lightbox class="save-record result-link-label" data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId()) ?>"><?=$this->transEsc('Add to favorites')?></a>
                   <i class="result-link-icon fa fa-fw fa-star" aria-hidden="true"></i><br/>
                   <?php /* Saved lists */ ?>
                   <div class="savedLists">
@@ -208,7 +208,7 @@
                       <div class="hierarchyTreeLink">
                           <input type="hidden" value="<?=$this->escapeHtmlAttr($hierarchyID)?>" class="hiddenHierarchyId" />
 
-                          <a class="hierarchyTreeLinkText result-link-label" data-lightbox href="<?=$this->recordLink()->getTabUrl($this->driver, 'HierarchyTree')?>?hierarchy=<?=urlencode($hierarchyID)?>#tabnav" title="<?=$this->transEsc('hierarchy_tree')?>" data-lightbox-href="<?=$this->recordLink()->getTabUrl($this->driver, 'AjaxTab')?>?hierarchy=<?=urlencode($hierarchyID)?>" data-lightbox-post="tab=hierarchytree">
+                          <a class="hierarchyTreeLinkText result-link-label" data-lightbox href="<?=$this->recordLinker($this->results)->getTabUrl($this->driver, 'HierarchyTree')?>?hierarchy=<?=urlencode($hierarchyID)?>#tabnav" title="<?=$this->transEsc('hierarchy_tree')?>" data-lightbox-href="<?=$this->recordLinker($this->results)->getTabUrl($this->driver, 'AjaxTab')?>?hierarchy=<?=urlencode($hierarchyID)?>" data-lightbox-post="tab=hierarchytree">
                               <?=$this->transEsc('hierarchy_view_context')?><?php if (count($trees) > 1): ?>: <?=$this->escapeHtml($hierarchyTitle)?><?php endif; ?>
                           </a>
                           <i class="result-link-icon fa fa-fw fa-sitemap" aria-hidden="true"></i>
diff --git a/templates/RecordDriver/SolrDspace/toolbar.phtml b/templates/RecordDriver/SolrDspace/toolbar.phtml
index abefb60..7800dbf 100755
--- a/templates/RecordDriver/SolrDspace/toolbar.phtml
+++ b/templates/RecordDriver/SolrDspace/toolbar.phtml
@@ -10,27 +10,27 @@
 <div id="suchauswahl" class="show-content suchauswahl">
 <ul class="record-nav nav nav-pills hidden-print">
   <?php if (count($this->driver->getCitationFormats()) > 0): ?>
-    <li><a class="cite-record" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'Cite')?>" rel="nofollow"><i class="fa fa-asterisk" aria-hidden="true"></i> <?=$this->transEsc('Cite this')?></a></li>
+    <li><a class="cite-record" data-lightbox href="<?=$this->recordLinker($this->results)->getActionUrl($this->driver, 'Cite')?>" rel="nofollow"><i class="fa fa-asterisk" aria-hidden="true"></i> <?=$this->transEsc('Cite this')?></a></li>
   <?php endif; ?>
   <?php if ($this->accountCapabilities()->getSmsSetting() !== 'disabled'): ?>
-    <li><a class="sms-record" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'SMS')?>" rel="nofollow"><i class="fa fa-mobile" aria-hidden="true"></i> <?=$this->transEsc('Text this')?></a></li>
+    <li><a class="sms-record" data-lightbox href="<?=$this->recordLinker($this->results)->getActionUrl($this->driver, 'SMS')?>" rel="nofollow"><i class="fa fa-mobile" aria-hidden="true"></i> <?=$this->transEsc('Text this')?></a></li>
   <?php endif; ?>
-  <li><a class="mail-record" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'Email')?>" rel="nofollow"><i class="fa fa-envelope" aria-hidden="true"></i> <?=$this->transEsc('Email this')?></a></li>
+  <li><a class="mail-record" data-lightbox href="<?=$this->recordLinker($this->results)->getActionUrl($this->driver, 'Email')?>" rel="nofollow"><i class="fa fa-envelope" aria-hidden="true"></i> <?=$this->transEsc('Email this')?></a></li>
 
   <?php $exportFormats = $this->export()->getFormatsForRecord($this->driver); ?>
   <?php if(count($exportFormats) > 0): ?>
     <li class="dropdown">
-      <a class="export-toggle dropdown-toggle" data-toggle="dropdown" href="<?=$this->recordLink()->getActionUrl($this->driver, 'Export')?>" rel="nofollow"><i class="fa fa-list-alt" aria-hidden="true"></i> <?=$this->transEsc('Export Record') ?></a>
+      <a class="export-toggle dropdown-toggle" data-toggle="dropdown" href="<?=$this->recordLinker($this->results)->getActionUrl($this->driver, 'Export')?>" rel="nofollow"><i class="fa fa-list-alt" aria-hidden="true"></i> <?=$this->transEsc('Export Record') ?></a>
       <ul class="dropdown-menu" role="menu">
         <?php foreach ($exportFormats as $exportFormat): ?>
-          <li><a <?php if ($this->export()->needsRedirect($exportFormat)): ?>target="<?=$this->escapeHtmlAttr($exportFormat)?>Main" <?php endif; ?>href="<?=$this->recordLink()->getActionUrl($this->driver, 'Export')?>?style=<?=$this->escapeHtmlAttr($exportFormat)?>" rel="nofollow"><?=$this->transEsc('Export to')?> <?=$this->transEsc($this->export()->getLabelForFormat($exportFormat))?></a></li>
+          <li><a <?php if ($this->export()->needsRedirect($exportFormat)): ?>target="<?=$this->escapeHtmlAttr($exportFormat)?>Main" <?php endif; ?>href="<?=$this->recordLinker($this->results)->getActionUrl($this->driver, 'Export')?>?style=<?=$this->escapeHtmlAttr($exportFormat)?>" rel="nofollow"><?=$this->transEsc('Export to')?> <?=$this->transEsc($this->export()->getLabelForFormat($exportFormat))?></a></li>
         <?php endforeach; ?>
       </ul>
     </li>
   <?php endif; ?>
 
   <?php if ($this->userlist()->getMode() !== 'disabled'): ?>
-    <li><a class="save-record" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" rel="nofollow"><i class="fa fa-star" aria-hidden="true"></i> <?=$this->transEsc('Add to favorites')?></a></li>
+    <li><a class="save-record" data-lightbox href="<?=$this->recordLinker($this->results)->getActionUrl($this->driver, 'Save')?>" rel="nofollow"><i class="fa fa-star" aria-hidden="true"></i> <?=$this->transEsc('Add to favorites')?></a></li>
   <?php endif; ?>
   <?php if (!empty($addThis)): ?>
     <li><a class="addThis addthis_button" href="https://www.addthis.com/bookmark.php?v=250&amp;pub=<?=urlencode($addThis)?>"><i class="fa fa-bookmark" aria-hidden="true"></i> <?=$this->transEsc('Bookmark')?></a></li>
diff --git a/templates/RecordDriver/SolrMarc/core.phtml b/templates/RecordDriver/SolrMarc/core.phtml
index 2ecccc8..a1a1d9f 100755
--- a/templates/RecordDriver/SolrMarc/core.phtml
+++ b/templates/RecordDriver/SolrMarc/core.phtml
@@ -39,7 +39,7 @@
       <p><?=$this->truncate($summary, 300)?></p>
 
       <?php if(strlen($summary) > 300): ?>
-        <p><a href='<?=$this->recordLink()->getTabUrl($this->driver, 'Description')?>#tabnav'><?=$this->transEsc('Full description')?></a></p>
+        <p><a href='<?=$this->recordLinker($this->results)->getTabUrl($this->driver, 'Description')?>#tabnav'><?=$this->transEsc('Full description')?></a></p>
       <?php endif; ?>
     <?php endif; ?>
 
diff --git a/templates/RecordDriver/SolrMarc/result-list.phtml b/templates/RecordDriver/SolrMarc/result-list.phtml
index 5ee4762..a61c68e 100755
--- a/templates/RecordDriver/SolrMarc/result-list.phtml
+++ b/templates/RecordDriver/SolrMarc/result-list.phtml
@@ -1,6 +1,10 @@
 <?php
+  $openUrl = $this->openUrl($this->driver, 'results');
+  $openUrlActive = $openUrl->isActive();
+  $urls = $this->record($this->driver)->getLinkDetails($openUrlActive);
+
   $account = $this->auth()->getManager(); 
-  $coverDetails = $this->record($this->driver)->getCoverDetails('result-list', 'medium', $this->recordLink()->getUrl($this->driver));
+  $coverDetails = $this->record($this->driver)->getCoverDetails('result-list', 'medium', $this->recordLinker($this->results)->getUrl($this->driver));
   $cover = $coverDetails['html'];
   $thumbnail = false;
   $thumbnailAlignment = $this->record($this->driver)->getThumbnailAlignment('result');
@@ -22,7 +26,8 @@
     $checkedOutLinks = [] ;
     if (strcmp($offlineMode,'ils-offline') != 0)  {
 
-        foreach ($holdings['holdings'] as $holding)  {
+	foreach (($holdings['holdings'] ?? []) as $holding)  {
+//        foreach ($holdings['holdings'] as $holding)  {
             foreach ($holding['items'] as $row)   {
 		if (strcmp($row['status'],'status_in_acquisition') != 0 && strcmp($row['status'],'status_internal_administration') != 0 )   {
  	               if (strtolower($row['reserve']) == 'x')   continue;
@@ -40,7 +45,7 @@
                         if ($check) $link .= 'checkRequest ';
                         $link .= 'placehold" ' ;
                         if (!empty($row['linkLightbox'])) $link .= 'data-lightbox ';
-                        $link .= "href=\""  .$this->recordLink()->getRequestUrl($row['link']) ."\">";
+                        $link .= "href=\""  .$this->recordLinker($this->results)->getRequestUrl($row['link']) ."\">";
                         if ($check) {
                                 $link .= $this->transEsc("Check Hold") ;
                           } else {
@@ -70,12 +75,12 @@
 <div class="media">
   <?php if ($thumbnail && $thumbnailAlignment == 'left'): ?>
     <?=$thumbnail ?>
-  <?php endif ?>
+  <?php endif; ?>
   <div class="media-body">
     <div class="result-body">
 
         <div class="title-container">
-            <a href="<?=$this->recordLink()->getUrl($this->driver)?>" class="title getFull" data-view="<?=$this->params->getOptions()->getListViewOption() ?>">
+            <a href="<?=$this->recordLinker($this->results)->getUrl($this->driver)?>" class="title getFull" data-view="<?=$this->params->getOptions()->getListViewOption() ?>">
             <?=$this->record($this->driver)->getTitleHtml()?>
 	    <?php $subTitle = $this->driver->getTitleSection(); ?>
             <?php if (!empty($subTitle)): ?>
@@ -124,7 +129,7 @@
                         <span class="status ajax-availability hidden">
                        		<span class="label label-default"><?=$this->transEsc('Loading')?>...</span>
                         </span>
-		    <?endif ; ?>
+		    <?php endif ; ?>
 		    <?php if ($eBook) : ?>
 			<?=$this->transEsc($itemNote)?>
                     <?php endif; ?>
@@ -145,7 +150,7 @@
             <?php $containerSource = $this->driver->getSourceIdentifier(); ?>
             <?php $containerID = $this->driver->getContainerRecordID(); ?>
             <?php /* TODO: handle highlighting more elegantly here: */?>
-            <a href="<?=($containerID ? $this->recordLink()->getUrl("$containerSource|$containerID") : $this->record($this->driver)->getLink('journaltitle', str_replace(array('{{{{START_HILITE}}}}', '{{{{END_HILITE}}}}'), '', $journalTitle)))?>"><?=$this->highlight($journalTitle) ?></a>
+            <a href="<?=($containerID ? $this->recordLinker($this->results)->getUrl("$containerSource|$containerID") : $this->record($this->driver)->getLink('journaltitle', str_replace(array('{{{{START_HILITE}}}}', '{{{{END_HILITE}}}}'), '', $journalTitle)))?>"><?=$this->highlight($journalTitle) ?></a>
             <?=!empty($summDate) ? ' (' . $this->escapeHtml($summDate[0]) . ')' : ''?>
           <?php elseif (!empty($summDate)): ?>
             <?=!empty($summAuthor) ? '<br />' : ''?>
@@ -175,26 +180,26 @@
         <?php endif; ?>
       <?php endif; ?>
 
-      <?
+      <?php
       /* Display information on duplicate records if available */
       if ($dedupData = $this->driver->getDedupData()): ?>
         <div class="dedupInformation">
-        <?
+        <?php
           $i = 0;
           foreach ($dedupData as $source => $current) {
             if (++$i == 1) {
-              ?><span class="currentSource"><a href="<?=$this->recordLink()->getUrl($this->driver)?>"><?=$this->transEsc("source_$source", array(), $source)?></a></span><?
+              ?><span class="currentSource"><a href="<?=$this->recordLinker($this->results)->getUrl($this->driver)?>"><?=$this->transEsc("source_$source", array(), $source)?></a></span><?
             } else {
               if ($i == 2) {
                 ?> <span class="otherSources">(<?=$this->transEsc('Other Sources')?>: <?
               } else {
-                ?>, <?
+                ?>, <?php
               }
-              ?><a href="<?=$this->recordLink()->getUrl($current['id'])?>"><?=$this->transEsc("source_$source", array(), $source)?></a><?
+              ?><a href="<?=$this->recordLinker($this->results)->getUrl($current['id'])?>"><?=$this->transEsc("source_$source", array(), $source)?></a><?
             }
           }
           if ($i > 1) {
-            ?>)</span><?
+            ?>)</span><?php
           }?>
         </div>
       <?php endif; ?>
@@ -232,7 +237,7 @@
 				<?php endif; ?>   
 
 				<?php $LoginRequired = false ; ?>
-					<?php if (((strpos($current['url'],"search.ebscohost.com/login.aspx") !== false) || (strpos($current['url'], "econtent.hogrefe.com")) !== false || strpos($current['url'],"research.ebsco.com/")) !== false || strlen($accessRestrictions[0]) > 0) : ?>
+					<?php if (((strpos($current['url'],"search.ebscohost.com/login.aspx") !== false) || (strpos($current['url'], "econtent.hogrefe.com")) !== false || strpos($current['url'],"research.ebsco.com/")) !== false || strlen(($accessRestrictions[0]) ?? '') > 0) : ?>
         				<?php $LoginRequired = true ;  ?>
     				<?php endif; ?>
 
@@ -254,7 +259,7 @@
           <div class="favorites">
               <?php if ($this->userlist()->getMode() !== 'disabled'): ?>
                   <?php /* Add to favorites */ ?>
-                  <a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" data-lightbox class="save-record result-link-label" data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId()) ?>"><?=$this->transEsc('Add to favorites')?></a>
+                  <a href="<?=$this->recordLinker($this->results)->getActionUrl($this->driver, 'Save')?>" data-lightbox class="save-record result-link-label" data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId()) ?>"><?=$this->transEsc('Add to favorites')?></a>
                   <i class="result-link-icon fa fa-fw fa-star" aria-hidden="true"></i><br/>
                   <?php /* Saved lists */ ?>
                   <div class="savedLists">
@@ -266,7 +271,7 @@
           <div class="result-links hidden-print">
               <?php /* Display qrcode if appropriate: */ ?>
               <?php if ($QRCode = $this->record($this->driver)->getQRCode("results")): ?>
-                  <?
+                  <?php
                   // Add JS Variables for QrCode
                   $this->jsTranslations()->addStrings(array('qrcode_hide' => 'qrcode_hide', 'qrcode_show' => 'qrcode_show'));
                   ?>
@@ -292,7 +297,7 @@
                       <div class="hierarchyTreeLink">
                           <input type="hidden" value="<?=$this->escapeHtmlAttr($hierarchyID)?>" class="hiddenHierarchyId" />
 
-                          <a class="hierarchyTreeLinkText result-link-label" data-lightbox href="<?=$this->recordLink()->getTabUrl($this->driver, 'HierarchyTree')?>?hierarchy=<?=urlencode($hierarchyID)?>#tabnav" title="<?=$this->transEsc('hierarchy_tree')?>" data-lightbox-href="<?=$this->recordLink()->getTabUrl($this->driver, 'AjaxTab')?>?hierarchy=<?=urlencode($hierarchyID)?>" data-lightbox-post="tab=hierarchytree">
+                          <a class="hierarchyTreeLinkText result-link-label" data-lightbox href="<?=$this->recordLinker($this->results)->getTabUrl($this->driver, 'HierarchyTree')?>?hierarchy=<?=urlencode($hierarchyID)?>#tabnav" title="<?=$this->transEsc('hierarchy_tree')?>" data-lightbox-href="<?=$this->recordLinker($this->results)->getTabUrl($this->driver, 'AjaxTab')?>?hierarchy=<?=urlencode($hierarchyID)?>" data-lightbox-post="tab=hierarchytree">
                               <?=$this->transEsc('hierarchy_view_context')?><?php if (count($trees) > 1): ?>: <?=$this->escapeHtml($hierarchyTitle)?><?php endif; ?>
                           </a>
                           <i class="result-link-icon fa fa-fw fa-sitemap" aria-hidden="true"></i>
@@ -306,11 +311,11 @@
   	<?php if (!empty($availableLinks)) : ?>
     		</br>
     		<a <?=$availableLinks[0] ?> </a><i class="fa fa-book fa-lg" style="color:#44801e;"></i>
-  	<?endif; ?>
+  	<?php endif; ?>
   	<?php if (empty($availableLinks) && !empty($checkedOutLinks)) : ?>
     		</br>
     		<a <?=$checkedOutLinks[0] ?> </a><i class="fa fa-book fa-lg" style="color:#44801e;"></i>
-  	<?endif; ?>
+  	<?php endif; ?>
   <?php endif ; ?>
 
               <?=$this->driver->supportsCoinsOpenUrl()?'<span class="Z3988" title="'.$this->escapeHtmlAttr($this->driver->getCoinsOpenUrl()).'"></span>':''?>
@@ -319,5 +324,5 @@
   </div>
   <?php if ($thumbnail && $thumbnailAlignment == 'right'): ?>
     <?=$thumbnail ?>
-  <?php endif ?>
+  <?php endif; ?>
 </div>
diff --git a/templates/RecordTab/holdingsils.phtml b/templates/RecordTab/holdingsils.phtml
index e184f24..8efc60e 100755
--- a/templates/RecordTab/holdingsils.phtml
+++ b/templates/RecordTab/holdingsils.phtml
@@ -113,17 +113,17 @@
 	<?php if ($account->loginEnabled() && $offlineMode != 'ils-offline'): ?>
     		<?php if (!$user): ?>
       			<div class="alert alert-info">
-        			<a href="<?=$this->recordLink()->getTabUrl($this->driver, 'Holdings')?>?login=true&amp;catalogLogin=true" data-lightbox><?=$this->transEsc("hold_login")?></a>
+        			<a href="<?=$this->recordLinker($this->results)->getTabUrl($this->driver, 'Holdings')?>?login=true&amp;catalogLogin=true" data-lightbox><?=$this->transEsc("hold_login")?></a>
       			</div>
 		   <?php elseif (!$user->cat_username): ?>
       			<div class="alert alert-info">
-        			<?=$this->translate("hold_profile_html", ['%%url%%' => $this->recordLink()->getTabUrl($this->driver, 'Holdings') . '?catalogLogin=true'])?>
+        			<?=$this->translate("hold_profile_html", ['%%url%%' => $this->recordLinker($this->results)->getTabUrl($this->driver, 'Holdings') . '?catalogLogin=true'])?>
       			</div>
 		<?php endif; ?>
 	<?php endif; ?>
 <?php endif; ?>
 <?php $holdingTitleHold = $this->driver->tryMethod('getRealTimeTitleHold'); if (!empty($holdingTitleHold)): ?>
-  	<a class="placehold" data-lightbox title="<?=$this->transEsc('request_place_text')?>" href="<?=$this->recordLink()->getRequestUrl($holdingTitleHold)?>"><i class="fa fa-flag" aria-hidden="true"></i>&nbsp;<?=$this->transEsc('title_hold_place')?></a>
+  	<a class="placehold" data-lightbox title="<?=$this->transEsc('request_place_text')?>" href="<?=$this->recordLinker($this->results)->getRequestUrl($holdingTitleHold)?>"><i class="fa fa-flag" aria-hidden="true"></i>&nbsp;<?=$this->transEsc('title_hold_place')?></a>
 <?php endif; ?>
 <?php if (!empty($urls) || $openUrlActive): ?>
 	<h3><?=$this->transEsc("Internet")?></h3>
@@ -206,13 +206,13 @@
 
               					<span class="text-success"><?=$this->transEsc("Available")?><link property="availability" href="http://schema.org/InStock" /></span>
               					<?php if (isset($row['link']) && $row['link']): ?>
-                					<a class="<?=$check ? 'checkRequest ' : ''?>placehold" <?php if (!empty($row['linkLightbox'])): ?>data-lightbox <?php endif; ?>href="<?=$this->recordLink()->getRequestUrl($row['link'])?>"><i class="fa fa-flag" aria-hidden="true"></i>&nbsp;<?=$this->transEsc($check ? "Check Hold" : "Place a Hold")?></a>
+                					<a class="<?=$check ? 'checkRequest ' : ''?>placehold" <?php if (!empty($row['linkLightbox'])): ?>data-lightbox <?php endif; ?>href="<?=$this->recordLinker($this->results)->getRequestUrl($row['link'])?>"><i class="fa fa-flag" aria-hidden="true"></i>&nbsp;<?=$this->transEsc($check ? "Check Hold" : "Place a Hold")?></a>
               					<?php endif; ?>
               					<?php if (isset($row['storageRetrievalRequestLink']) && $row['storageRetrievalRequestLink']): ?>
-                					<a class="<?=$checkStorageRetrievalRequest ? 'checkStorageRetrievalRequest ' : ''?> placeStorageRetrievalRequest" data-lightbox href="<?=$this->recordLink()->getRequestUrl($row['storageRetrievalRequestLink'])?>"><i class="fa fa-flag" aria-hidden="true"></i>&nbsp;<?=$this->transEsc($checkStorageRetrievalRequest ? "storage_retrieval_request_check_text" : "storage_retrieval_request_place_text")?></a>
+                					<a class="<?=$checkStorageRetrievalRequest ? 'checkStorageRetrievalRequest ' : ''?> placeStorageRetrievalRequest" data-lightbox href="<?=$this->recordLinker($this->results)->getRequestUrl($row['storageRetrievalRequestLink'])?>"><i class="fa fa-flag" aria-hidden="true"></i>&nbsp;<?=$this->transEsc($checkStorageRetrievalRequest ? "storage_retrieval_request_check_text" : "storage_retrieval_request_place_text")?></a>
               					<?php endif; ?>
               					<?php if (isset($row['ILLRequestLink']) && $row['ILLRequestLink']): ?>
-                					<a class="<?=$checkILLRequest ? 'checkILLRequest ' : ''?>placeILLRequest" data-lightbox href="<?=$this->recordLink()->getRequestUrl($row['ILLRequestLink'])?>"><i class="fa fa-flag" aria-hidden="true"></i>&nbsp;<?=$this->transEsc($checkILLRequest ? "ill_request_check_text" : "ill_request_place_text")?></a>
+                					<a class="<?=$checkILLRequest ? 'checkILLRequest ' : ''?>placeILLRequest" data-lightbox href="<?=$this->recordLinker($this->results)->getRequestUrl($row['ILLRequestLink'])?>"><i class="fa fa-flag" aria-hidden="true"></i>&nbsp;<?=$this->transEsc($checkILLRequest ? "ill_request_check_text" : "ill_request_place_text")?></a>
               					<?php endif; ?>
             			<?php else: ?>
              			   	<?php /* Begin Unavailable Items (Recalls) */ ?>
@@ -232,7 +232,7 @@
               					<?php endif; ?>
 	      					<?php if ($row['reserve'] != "X"): ?>
                   					<?php if (!$block && isset($row['link']) && $row['link']): ?>
-                          					<a class="<?=$check ? 'checkRequest' : ''?> placehold" <?php if (!empty($row['linkLightbox'])): ?>data-lightbox <?php endif; ?>href="<?=$this->recordLink()->getRequestUrl($row['link'])?>"><i class="fa fa-flag" aria-hidden="true"></i>&nbsp;<?=$this->transEsc($check ? "Check Recall" : "Recall This")?></a>
+                          					<a class="<?=$check ? 'checkRequest' : ''?> placehold" <?php if (!empty($row['linkLightbox'])): ?>data-lightbox <?php endif; ?>href="<?=$this->recordLinker($this->results)->getRequestUrl($row['link'])?>"><i class="fa fa-flag" aria-hidden="true"></i>&nbsp;<?=$this->transEsc($check ? "Check Recall" : "Recall This")?></a>
 		  					<?php endif; ?>
 						<?php endif ; ?>
               				<?php endif; ?>
diff --git a/templates/RecordTab/holdingsils.phtmlwq b/templates/RecordTab/holdingsils.phtmlwq
index 9197160..64c6abe 100755
--- a/templates/RecordTab/holdingsils.phtmlwq
+++ b/templates/RecordTab/holdingsils.phtmlwq
@@ -109,17 +109,17 @@
   <?php if ($account->loginEnabled() && $offlineMode != 'ils-offline'): ?>
     <?php if (!$user): ?>
       <div class="alert alert-info">
-        <a href="<?=$this->recordLink()->getTabUrl($this->driver, 'Holdings')?>?login=true&amp;catalogLogin=true" data-lightbox><?=$this->transEsc("hold_login")?></a>
+        <a href="<?=$this->recordLinker($this->results)->getTabUrl($this->driver, 'Holdings')?>?login=true&amp;catalogLogin=true" data-lightbox><?=$this->transEsc("hold_login")?></a>
       </div>
     <?php elseif (!$user->cat_username): ?>
       <div class="alert alert-info">
-        <?=$this->translate("hold_profile_html", ['%%url%%' => $this->recordLink()->getTabUrl($this->driver, 'Holdings') . '?catalogLogin=true'])?>
+        <?=$this->translate("hold_profile_html", ['%%url%%' => $this->recordLinker($this->results)->getTabUrl($this->driver, 'Holdings') . '?catalogLogin=true'])?>
       </div>
     <?php endif; ?>
   <?php endif; ?>
 <?php endif; ?>
 <?php $holdingTitleHold = $this->driver->tryMethod('getRealTimeTitleHold'); if (!empty($holdingTitleHold)): ?>
-  <a class="placehold" data-lightbox title="<?=$this->transEsc('request_place_text')?>" href="<?=$this->recordLink()->getRequestUrl($holdingTitleHold)?>"><i class="fa fa-flag" aria-hidden="true"></i>&nbsp;<?=$this->transEsc('title_hold_place')?></a>
+  <a class="placehold" data-lightbox title="<?=$this->transEsc('request_place_text')?>" href="<?=$this->recordLinker($this->results)->getRequestUrl($holdingTitleHold)?>"><i class="fa fa-flag" aria-hidden="true"></i>&nbsp;<?=$this->transEsc('title_hold_place')?></a>
 <?php endif; ?>
 <?php if (!empty($urls) || $openUrlActive): ?>
   <h3><?=$this->transEsc("Internet")?></h3>
@@ -207,13 +207,13 @@
 	      <?php if (!$eBook) : ?>
               <span class="text-success"><?=$this->transEsc("Available")?><link property="availability" href="http://schema.org/InStock" /></span>
               <?php if (isset($row['link']) && $row['link']): ?>
-                <a class="<?=$check ? 'checkRequest ' : ''?>placehold" <?php if (!empty($row['linkLightbox'])): ?>data-lightbox <?php endif; ?>href="<?=$this->recordLink()->getRequestUrl($row['link'])?>"><i class="fa fa-flag" aria-hidden="true"></i>&nbsp;<?=$this->transEsc($check ? "Check Hold" : "Place a Hold")?></a>
+                <a class="<?=$check ? 'checkRequest ' : ''?>placehold" <?php if (!empty($row['linkLightbox'])): ?>data-lightbox <?php endif; ?>href="<?=$this->recordLinker($this->results)->getRequestUrl($row['link'])?>"><i class="fa fa-flag" aria-hidden="true"></i>&nbsp;<?=$this->transEsc($check ? "Check Hold" : "Place a Hold")?></a>
               <?php endif; ?>
               <?php if (isset($row['storageRetrievalRequestLink']) && $row['storageRetrievalRequestLink']): ?>
-                <a class="<?=$checkStorageRetrievalRequest ? 'checkStorageRetrievalRequest ' : ''?> placeStorageRetrievalRequest" data-lightbox href="<?=$this->recordLink()->getRequestUrl($row['storageRetrievalRequestLink'])?>"><i class="fa fa-flag" aria-hidden="true"></i>&nbsp;<?=$this->transEsc($checkStorageRetrievalRequest ? "storage_retrieval_request_check_text" : "storage_retrieval_request_place_text")?></a>
+                <a class="<?=$checkStorageRetrievalRequest ? 'checkStorageRetrievalRequest ' : ''?> placeStorageRetrievalRequest" data-lightbox href="<?=$this->recordLinker($this->results)->getRequestUrl($row['storageRetrievalRequestLink'])?>"><i class="fa fa-flag" aria-hidden="true"></i>&nbsp;<?=$this->transEsc($checkStorageRetrievalRequest ? "storage_retrieval_request_check_text" : "storage_retrieval_request_place_text")?></a>
               <?php endif; ?>
               <?php if (isset($row['ILLRequestLink']) && $row['ILLRequestLink']): ?>
-                <a class="<?=$checkILLRequest ? 'checkILLRequest ' : ''?>placeILLRequest" data-lightbox href="<?=$this->recordLink()->getRequestUrl($row['ILLRequestLink'])?>"><i class="fa fa-flag" aria-hidden="true"></i>&nbsp;<?=$this->transEsc($checkILLRequest ? "ill_request_check_text" : "ill_request_place_text")?></a>
+                <a class="<?=$checkILLRequest ? 'checkILLRequest ' : ''?>placeILLRequest" data-lightbox href="<?=$this->recordLinker($this->results)->getRequestUrl($row['ILLRequestLink'])?>"><i class="fa fa-flag" aria-hidden="true"></i>&nbsp;<?=$this->transEsc($checkILLRequest ? "ill_request_check_text" : "ill_request_place_text")?></a>
               <?php endif; ?>
             <?php else: ?>
               <?php /* Begin Unavailable Items (Recalls) */ ?>
@@ -232,7 +232,7 @@
               <?php endif; ?>
 	      <?php if ($row['reserve'] != "X"): ?>
                   <?php if (!$block && isset($row['link']) && $row['link']): ?>
-                          <a class="<?=$check ? 'checkRequest' : ''?> placehold" <?php if (!empty($row['linkLightbox'])): ?>data-lightbox <?php endif; ?>href="<?=$this->recordLink()->getRequestUrl($row['link'])?>"><i class="fa fa-flag" aria-hidden="true"></i>&nbsp;<?=$this->transEsc($check ? "Check Recall" : "Recall This")?></a>
+                          <a class="<?=$check ? 'checkRequest' : ''?> placehold" <?php if (!empty($row['linkLightbox'])): ?>data-lightbox <?php endif; ?>href="<?=$this->recordLinker($this->results)->getRequestUrl($row['link'])?>"><i class="fa fa-flag" aria-hidden="true"></i>&nbsp;<?=$this->transEsc($check ? "Check Recall" : "Recall This")?></a>
 		  <?php endif; ?>
               <?php endif; ?>
             <?php endif; ?>
diff --git a/templates/authority/record.phtml b/templates/authority/record.phtml
index cc73921..ae2cf05 100644
--- a/templates/authority/record.phtml
+++ b/templates/authority/record.phtml
@@ -50,11 +50,11 @@
               			<?php if ($this->scrollData['previousRecord']): ?>
                   			<?php if ($this->scrollData['firstRecord']): ?>
                       				<li>
-                          				<a href="<?=$this->recordLink()->getUrl($this->scrollData['firstRecord'])?>" title="<?=$this->transEsc('First Search Result')?>" rel="nofollow">&laquo; <?=$this->transEsc('First')?></a>
+                          				<a href="<?=$this->recordLinker($this->results)->getUrl($this->scrollData['firstRecord'])?>" title="<?=$this->transEsc('First Search Result')?>" rel="nofollow">&laquo; <?=$this->transEsc('First')?></a>
                       				</li>
                   			<?php endif; ?>
                   			<li>
-                      				<a href="<?=$this->recordLink()->getUrl($this->scrollData['previousRecord'])?>" title="<?=$this->transEsc('Previous Search Result')?>" rel="nofollow">&laquo; <?=$this->transEsc('Prev')?></a>
+                      				<a href="<?=$this->recordLinker($this->results)->getUrl($this->scrollData['previousRecord'])?>" title="<?=$this->transEsc('Previous Search Result')?>" rel="nofollow">&laquo; <?=$this->transEsc('Prev')?></a>
                   			</li>
               			<?php else: ?>
                   			<?php if ($this->scrollData['firstRecord']): ?>
@@ -68,11 +68,11 @@
               			]) ?>
               			<?php if ($this->scrollData['nextRecord']): ?>
                   			<li>
-                      				<a href="<?=$this->recordLink()->getUrl($this->scrollData['nextRecord'])?>" title="<?=$this->transEsc('Next Search Result')?>" rel="nofollow"><?=$this->transEsc('Next')?> &raquo;</a>
+                      				<a href="<?=$this->recordLinker($this->results)->getUrl($this->scrollData['nextRecord'])?>" title="<?=$this->transEsc('Next Search Result')?>" rel="nofollow"><?=$this->transEsc('Next')?> &raquo;</a>
                   			</li>
                   			<?php if ($this->scrollData['lastRecord']): ?>
                       				<li>
-                          				<a href="<?=$this->recordLink()->getUrl($this->scrollData['lastRecord'])?>" title="<?=$this->transEsc('Last Search Result')?>" rel="nofollow"><?=$this->transEsc('Last')?> &raquo;</a>
+                          				<a href="<?=$this->recordLinker($this->results)->getUrl($this->scrollData['lastRecord'])?>" title="<?=$this->transEsc('Last Search Result')?>" rel="nofollow"><?=$this->transEsc('Last')?> &raquo;</a>
                       				</li>
                   			<?php endif; ?>
               			<?php else: ?>
diff --git a/templates/cart/contents.phtml b/templates/cart/contents.phtml
index f47e97c..2112205 100755
--- a/templates/cart/contents.phtml
+++ b/templates/cart/contents.phtml
@@ -6,7 +6,7 @@
       <div class="checkbox">
         <label>
           <?=$this->record($record)->getCheckbox('cart')?>
-          <a title="<?=$this->transEsc('View Record')?>" href="<?=$this->recordLink()->getUrl($record)?>" data-lightbox-ignore><?=$this->escapeHtml($record->getBreadcrumb())?></a>
+          <a title="<?=$this->transEsc('View Record')?>" href="<?=$this->recordLinker($this->results)->getUrl($record)?>" data-lightbox-ignore><?=$this->escapeHtml($record->getBreadcrumb())?></a>
         </label>
       </div>
     </li>
diff --git a/templates/myresearch/checkedout.phtml b/templates/myresearch/checkedout.phtml
index 37f8ad0..ff20f5d 100644
--- a/templates/myresearch/checkedout.phtml
+++ b/templates/myresearch/checkedout.phtml
@@ -83,7 +83,7 @@
         <?php endif; ?>
 
         <?
-          $coverDetails = $this->record($resource)->getCoverDetails('checkedout', 'small', $this->recordLink()->getUrl($resource));
+          $coverDetails = $this->record($resource)->getCoverDetails('checkedout', 'small', $this->recordLinker($this->results)->getUrl($resource));
           $cover = $coverDetails['html'];
           $thumbnail = false;
           $thumbnailAlignment = $this->record($resource)->getThumbnailAlignment('account');
@@ -105,7 +105,7 @@
               if (is_a($resource, 'VuFind\\RecordDriver\\SolrDefault') && !is_a($resource, 'VuFind\\RecordDriver\\Missing')) {
                 $title = $resource->getTitle();
                 $title = empty($title) ? $this->transEsc('Title not available') : $this->escapeHtml($title);
-                echo '<a href="' . $this->recordLink()->getUrl($resource) .
+                echo '<a href="' . $this->recordLinker($this->results)->getUrl($resource) .
                   '" class="title">' . $title . '</a>';
               } else if (isset($ilsDetails['title']) && !empty($ilsDetails['title'])){
                 // If the record is not available in Solr, perhaps the ILS driver sent us a title we can show...
@@ -148,7 +148,7 @@
             <?php endif; ?>
 
             <?php if (isset($ilsDetails['renew'])): ?>
-		<?if(isset($ilsDetails['renewlimit'])) : ?>
+		<?php if(isset($ilsDetails['renewlimit'])) : ?>
 		    <?php if($ilsDetails['renewLimit'] > 0) : ?>
               		<strong><?=$this->transEsc('Renewed')?>:</strong> <?=$this->transEsc($ilsDetails['renew'])?>
 	      		<strong>(<?=$this->transEsc('Last renewal')?>: </strong> <?=$this->transEsc($ilsDetails['lastreneweddate'])?>)
diff --git a/templates/record/email.phtml b/templates/record/email.phtml
index e6f5927..d3debc5 100755
--- a/templates/record/email.phtml
+++ b/templates/record/email.phtml
@@ -4,11 +4,11 @@
 
   // Set up breadcrumbs:
   $this->layout()->breadcrumbs = '<li>' . $this->searchMemory()->getLastSearchLink($this->transEsc('Search'), '', '</li> ')
-    . '<li>' . $this->recordLink()->getBreadcrumb($this->driver) . '</li> '
+    . '<li>' . $this->recordLinker($this->results)->getBreadcrumb($this->driver) . '</li> '
     . '<li class="active">' . $this->transEsc('Email Record') . '</li>';
 ?>
 <h2><?=$this->transEsc('Email Record') ?>: <span class="title-in-heading"><?=$this->escapeHtml($this->driver->getBreadcrumb())?></span></h2>
-<form class="form-record-email" method="post" action="<?=$this->recordLink()->getActionUrl($this->driver, 'Email')?>" name="emailRecord">
+<form class="form-record-email" method="post" action="<?=$this->recordLinker($this->results)->getActionUrl($this->driver, 'Email')?>" name="emailRecord">
   <?=$this->flashmessages()?>
   <input type="hidden" name="id" value="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>" />
   <input type="hidden" name="source" value="<?=$this->escapeHtmlAttr($this->driver->getSourceIdentifier())?>" />
diff --git a/templates/record/hold.phtml b/templates/record/hold.phtml
index a76adff..81cc538 100644
--- a/templates/record/hold.phtml
+++ b/templates/record/hold.phtml
@@ -4,7 +4,7 @@
 
     // Set up breadcrumbs:
     $this->layout()->breadcrumbs = '<li>' . $this->searchMemory()->getLastSearchLink($this->transEsc('Search'), '', '</li> ')
-        . '<li>' . $this->recordLink()->getBreadcrumb($this->driver) . '</li> '
+        . '<li>' . $this->recordLinker($this->results)->getBreadcrumb($this->driver) . '</li> '
         . '<li class="active">' . $this->transEsc('request_place_text') . '</li>';
 ?>
 <h2><?=$this->transEsc('request_place_text')?></h2>
diff --git a/templates/record/view.phtml b/templates/record/view.phtml
index b1583f7..924b47d 100755
--- a/templates/record/view.phtml
+++ b/templates/record/view.phtml
@@ -10,12 +10,12 @@
 
   // Add RDF header link if applicable:
   if ($this->export()->recordSupportsFormat($this->driver, 'RDF')) {
-    $this->headLink()->appendAlternate($this->recordLink()->getActionUrl($this->driver, 'RDF'), 'application/rdf+xml', 'RDF Representation');
+    $this->headLink()->appendAlternate($this->recordLinker($this->results)->getActionUrl($this->driver, 'RDF'), 'application/rdf+xml', 'RDF Representation');
   }
 
   // Set up breadcrumbs:
   $this->layout()->breadcrumbs = '<li>' . $this->searchMemory()->getLastSearchLink($this->transEsc('Resultlist'), '', '</li> ') .
-    '<li class="active">' . $this->recordLink()->getBreadcrumb($this->driver) . '</li> ';
+    '<li class="active">' . $this->recordLinker($this->results)->getBreadcrumb($this->driver) . '</li> ';
   $this->layout()->title = $this->driver->getShortTitle();
 ?>
 
@@ -28,11 +28,11 @@
               <?php if ($this->scrollData['previousRecord']): ?>
                   <?php if ($this->scrollData['firstRecord']): ?>
                       <li>
-                          <a href="<?=$this->recordLink()->getUrl($this->scrollData['firstRecord'])?>" title="<?=$this->transEsc('First Search Result')?>" rel="nofollow">&laquo; <?=$this->transEsc('First')?></a>
+                          <a href="<?=$this->recordLinker($this->results)->getUrl($this->scrollData['firstRecord'])?>" title="<?=$this->transEsc('First Search Result')?>" rel="nofollow">&laquo; <?=$this->transEsc('First')?></a>
                       </li>
                   <?php endif; ?>
                   <li>
-                      <a href="<?=$this->recordLink()->getUrl($this->scrollData['previousRecord'])?>" title="<?=$this->transEsc('Previous Search Result')?>" rel="nofollow">&laquo; <?=$this->transEsc('Prev')?></a>
+                      <a href="<?=$this->recordLinker($this->results)->getUrl($this->scrollData['previousRecord'])?>" title="<?=$this->transEsc('Previous Search Result')?>" rel="nofollow">&laquo; <?=$this->transEsc('Prev')?></a>
                   </li>
               <?php else: ?>
                   <?php if ($this->scrollData['firstRecord']): ?>
@@ -46,11 +46,11 @@
               ]) ?>
               <?php if ($this->scrollData['nextRecord']): ?>
                   <li>
-                      <a href="<?=$this->recordLink()->getUrl($this->scrollData['nextRecord'])?>" title="<?=$this->transEsc('Next Search Result')?>" rel="nofollow"><?=$this->transEsc('Next')?> &raquo;</a>
+                      <a href="<?=$this->recordLinker($this->results)->getUrl($this->scrollData['nextRecord'])?>" title="<?=$this->transEsc('Next Search Result')?>" rel="nofollow"><?=$this->transEsc('Next')?> &raquo;</a>
                   </li>
                   <?php if ($this->scrollData['lastRecord']): ?>
                       <li>
-                          <a href="<?=$this->recordLink()->getUrl($this->scrollData['lastRecord'])?>" title="<?=$this->transEsc('Last Search Result')?>" rel="nofollow"><?=$this->transEsc('Last')?> &raquo;</a>
+                          <a href="<?=$this->recordLinker($this->results)->getUrl($this->scrollData['lastRecord'])?>" title="<?=$this->transEsc('Last Search Result')?>" rel="nofollow"><?=$this->transEsc('Last')?> &raquo;</a>
                       </li>
                   <?php endif; ?>
               <?php else: ?>
@@ -90,7 +90,7 @@
               if (!$obj->supportsAjax()) { $tab_classes[] = 'noajax'; }
             ?>
             <li<?=count($tab_classes) > 0 ? ' class="' . implode(' ', $tab_classes) . '"' : ''?>>
-              <a class="<?=strtolower($tab) ?>" href="<?=$this->recordLink()->getTabUrl($this->driver, $tab)?>#tabnav"<?php if ($obj->supportsAjax() && in_array($tab, $this->backgroundTabs)):?> data-background<?php endif ?>><?=$this->transEsc($desc)?></a>
+              <a class="<?=strtolower($tab) ?>" href="<?=$this->recordLinker($this->results)->getTabUrl($this->driver, $tab)?>#tabnav"<?php if ($obj->supportsAjax() && in_array($tab, $this->backgroundTabs)):?> data-background<?php endif ?>><?=$this->transEsc($desc)?></a>
             </li>
           <?php endforeach; ?>
         </ul>
diff --git a/templates/search/advanced/layout.phtml b/templates/search/advanced/layout.phtml
index 082baa5..1afe995 100755
--- a/templates/search/advanced/layout.phtml
+++ b/templates/search/advanced/layout.phtml
@@ -106,10 +106,10 @@
                     <div id="new_search_template">
                   <?php endif; ?>
                   <div id="search<?=$group.'_'.$search ?>" class="adv-search">
-                    <input name="lookfor<?=$group ?>[]" id="search_lookfor<?=$group.'_'.$search ?>" class="adv-term-input form-control" type="text"<?if(isset($setQueries[$group][$search])):?> value="<?=$this->escapeHtml($setQueries[$group][$search]->getString())?>"<?endif;?>>
+                    <input name="lookfor<?=$group ?>[]" id="search_lookfor<?=$group.'_'.$search ?>" class="adv-term-input form-control" type="text"<?php if(isset($setQueries[$group][$search])):?> value="<?=$this->escapeHtml($setQueries[$group][$search]->getString())?>"<?endif;?>>
                     <select class="adv-term-type form-control" name="type<?=$group ?>[]">
                       <?php foreach ($this->options->getAdvancedHandlers() as $searchVal => $searchDesc): ?>
-                        <option value="<?=$this->escapeHtml($searchVal)?>"<?if(isset($setQueries[$group][$search]) && $searchVal == $setQueries[$group][$search]->getHandler()):?> selected<?endif;?>><?=$this->transEsc($searchDesc)?></option>
+                        <option value="<?=$this->escapeHtml($searchVal)?>"<?php if(isset($setQueries[$group][$search]) && $searchVal == $setQueries[$group][$search]->getHandler()):?> selected<?endif;?>><?=$this->transEsc($searchDesc)?></option>
                       <?php endforeach; ?>
                     </select>
                     <a href="#" class="adv-term-remove hidden"></a>
diff --git a/templates/search/bulk-action-buttons.phtml b/templates/search/bulk-action-buttons.phtml
index 71a3f7e..4428602 100755
--- a/templates/search/bulk-action-buttons.phtml
+++ b/templates/search/bulk-action-buttons.phtml
@@ -1,7 +1,7 @@
 <?php if (isset($this->showCheckboxes) && $this->showCheckboxes): ?>
   <div class="bulkActionButtons hidden-print">
     <div class="bulk-checkbox">
-      <input type="checkbox" class="checkbox-select-all" name="selectAll" id="<?=$this->idPrefix?>addFormCheckboxSelectAll"<?if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<?php endif; ?>/>
+      <input type="checkbox" class="checkbox-select-all" name="selectAll" id="<?=$this->idPrefix?>addFormCheckboxSelectAll"<?php if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<?php endif; ?>/>
       <label for="<?=$this->idPrefix?>addFormCheckboxSelectAll">
         <?=$this->transEsc('select_page')?>
         &#124; <?=$this->transEsc('with_selected')?>:
@@ -9,17 +9,17 @@
     </div>
     <div class="btn-group">
       <?php if (isset($this->showBulkOptions) && $this->showBulkOptions): ?>
-        <input id="ribbon-email" class="btn btn-default" type="submit" name="email" title="<?=$this->transEsc('bookbag_email_selected')?>" value="<?=$this->transEsc('Email')?>"<?if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<?php endif; ?>/>
+        <input id="ribbon-email" class="btn btn-default" type="submit" name="email" title="<?=$this->transEsc('bookbag_email_selected')?>" value="<?=$this->transEsc('Email')?>"<?php if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<?php endif; ?>/>
         <?php $exportOptions = $this->export()->getBulkOptions(); if (count($exportOptions) > 0): ?>
-          <input id="ribbon-export" class="btn btn-default" type="submit" name="export" title="<?=$this->transEsc('bookbag_export_selected')?>" value="<?=$this->transEsc('Export')?>"<?if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<?php endif; ?>/>
+          <input id="ribbon-export" class="btn btn-default" type="submit" name="export" title="<?=$this->transEsc('bookbag_export_selected')?>" value="<?=$this->transEsc('Export')?>"<?php if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<?php endif; ?>/>
         <?php endif; ?>
-        <input id="ribbon-print" class="btn btn-default" type="submit" name="print" title="<?=$this->transEsc('bookbag_print_selected')?>" value="<?=$this->transEsc('Print')?>"<?if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<?php endif; ?>/>
+        <input id="ribbon-print" class="btn btn-default" type="submit" name="print" title="<?=$this->transEsc('bookbag_print_selected')?>" value="<?=$this->transEsc('Print')?>"<?php if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<?php endif; ?>/>
         <?php if ($this->userlist()->getMode() !== 'disabled'): ?>
-          <input id="ribbon-save" class="btn btn-default" type="submit" name="saveCart" title="<?=$this->transEsc('bookbag_save_selected')?>" value="<?=$this->transEsc('Save')?>"<?if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<?php endif; ?>/>
+          <input id="ribbon-save" class="btn btn-default" type="submit" name="saveCart" title="<?=$this->transEsc('bookbag_save_selected')?>" value="<?=$this->transEsc('Save')?>"<?php if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<?php endif; ?>/>
         <?php endif; ?>
       <?php endif; ?>
       <?php if (isset($this->showCartControls) && $this->showCartControls): ?>
-        <input id="<?=$this->idPrefix?>updateCart" type="submit" class="btn btn-default" name="add" value="<?=$this->transEsc('Add to Book Bag')?>"<?if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<?php endif; ?>/>
+        <input id="<?=$this->idPrefix?>updateCart" type="submit" class="btn btn-default" name="add" value="<?=$this->transEsc('Add to Book Bag')?>"<?php if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<?php endif; ?>/>
       <?php endif; ?>
     </div>
   </div>
diff --git a/templates/search/results.phtml b/templates/search/results.phtml
index cfaf93f..4c4a6ac 100755
--- a/templates/search/results.phtml
+++ b/templates/search/results.phtml
@@ -18,7 +18,7 @@
         'searchId' => $this->results->getSearchId(),
         'searchClassId' => $this->params->getSearchClassId(),
         'checkboxFilters' => $this->params->getCheckboxFacets(),
-        'filterList' => $this->params->getFilters(),
+        'filterList' => $this->params->getFilterList(true),
         'hasDefaultsApplied' => $this->params->hasDefaultsApplied(),
         'selectedShards' => $this->params->getSelectedShards(),
         'ignoreHiddenFiltersInRequest' => isset($this->ignoreHiddenFiltersInRequest) ? $this->ignoreHiddenFiltersInRequest : false,