diff --git a/themes/finc/js/openurl.js b/themes/finc/js/openurl.js
index fbe2f20e8c53fcafcfa67a77ced9f58995a43220..578e73d0c24ca466773ef6e2ba6d39334df329e0 100644
--- a/themes/finc/js/openurl.js
+++ b/themes/finc/js/openurl.js
@@ -17,7 +17,7 @@ VuFind.register('openurl', function() {
     });
   };
 
-  var _embedOpenUrlLinks = function(element) {
+  var embedOpenUrlLinks = function(element) {
     // Extract the OpenURL associated with the clicked element:
     var openUrl = element.children('span.openUrl:first').attr('title');
   
@@ -55,12 +55,15 @@ VuFind.register('openurl', function() {
   
     // assign action to the openUrlEmbed link class
     container.find('.openUrlEmbed a').unbind('click').click(function() {
-      _embedOpenUrlLinks($(this));
+      embedOpenUrlLinks($(this));
       return false;
     });
   
     container.find('.openUrlEmbed.openUrlEmbedAutoLoad a').trigger('click');
   };
-  return {init: init};
+  return {
+    init: init,
+    embedOpenUrlLinks: embedOpenUrlLinks
+  };
 });
 
diff --git a/themes/finc/templates/RecordDriver/SolrDefault/toolbar.phtml b/themes/finc/templates/RecordDriver/SolrDefault/toolbar.phtml
index ac6baf9f89a5301f3b404c3aebf2c137143f5b0e..1c044e1023eaeea074fdc251894bf38bc991f3ff 100644
--- a/themes/finc/templates/RecordDriver/SolrDefault/toolbar.phtml
+++ b/themes/finc/templates/RecordDriver/SolrDefault/toolbar.phtml
@@ -7,7 +7,6 @@ if (!empty($addThis)) {
 
 // Set up some variables for convenience:
 $id = $this->driver->getUniqueId();
-$controllerClass = 'controller:' . $this->record($this->driver)->getController();
 $cart = $this->cart();
 $cartId = $this->driver->getSourceIdentifier() . '|' . $id;
 ?>
@@ -15,16 +14,16 @@ $cartId = $this->driver->getSourceIdentifier() . '|' . $id;
   <dt class="sr-only"><?=$this->transEsc('Toolbar')?></dt>
     <? if (count($this->driver->getCitationFormats()) > 0): ?>
       <dd>
-        <a class="cite-record <?=$controllerClass?>" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'Cite')?>" rel="nofollow"><i class="fa fa-asterisk"></i> <?=$this->transEsc('Cite this')?></a>
+        <a class="cite-record" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'Cite')?>" rel="nofollow"><i class="fa fa-asterisk"></i> <?=$this->transEsc('Cite this')?></a>
       </dd>
     <? endif; ?>
     <? /*
     <dd>
-      <a class="sms-record <?=$controllerClass?>" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'SMS')?>" rel="nofollow"><i class="fa fa-mobile"></i> <?=$this->transEsc('Text this')?></a>
+      <a class="sms-record" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'SMS')?>" rel="nofollow"><i class="fa fa-mobile"></i> <?=$this->transEsc('Text this')?></a>
     </dd>
     */ ?>
     <dd>
-      <a class="mail-record <?=$controllerClass?>" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'Email')?>" rel="nofollow"><i class="fa fa-envelope"></i> <?=$this->transEsc('Email this')?></a>
+      <a class="mail-record" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'Email')?>" rel="nofollow"><i class="fa fa-envelope"></i> <?=$this->transEsc('Email this')?></a>
     </dd>
 
     <? $exportFormats = $this->export()->getFormatsForRecord($this->driver); ?>
@@ -44,7 +43,7 @@ $cartId = $this->driver->getSourceIdentifier() . '|' . $id;
 
     <? if ($this->userlist()->getMode() !== 'disabled'): ?>
       <dd>
-        <a class="save-record <?=$controllerClass?>" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" title="<?=$this->transEsc('Add to favorites')?>" rel="nofollow"><i class="fa fa-star"></i> <?=$this->transEsc('Add to favorites')?></a>
+        <a class="save-record" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" title="<?=$this->transEsc('Add to favorites')?>" rel="nofollow"><i class="fa fa-star"></i> <?=$this->transEsc('Add to favorites')?></a>
       </dd>
     <? endif; ?>
     <? if (!empty($addThis)): ?>
diff --git a/themes/finc/templates/RecordTab/holdingsils.phtml b/themes/finc/templates/RecordTab/holdingsils.phtml
index 8ab75f5a1dad81a570fce8060a5c3efc09de248c..7bb61616c87a9870861cdfbb606ba960d0e29cee 100644
--- a/themes/finc/templates/RecordTab/holdingsils.phtml
+++ b/themes/finc/templates/RecordTab/holdingsils.phtml
@@ -77,8 +77,8 @@
     $checkILLRequest = isset($row['checkILLRequest']) && $row['checkILLRequest'];
     // AJAX block record?
     $block = !$check && isset($row['addLink']) && $row['addLink'] === 'block';
-    $blockStorageRetrievalRequest = !$checkStorageRetrievalRequest && isset($row['addStorageRetrievalRequestLink']) && $row['addStorageRetrievalRequestLink'];
-    $blockILLRequest = !$checkILLRequest && isset($row['addILLRequestLink']) && $row['addILLRequestLink'];
+    $blockStorageRetrievalRequest = !$checkStorageRetrievalRequest && isset($row['addStorageRetrievalRequestLink']) && $row['addStorageRetrievalRequestLink'] === 'block';
+    $blockILLRequest = !$checkILLRequest && isset($row['addILLRequestLink']) && $row['addILLRequestLink'] === 'block';
     $checkEmailHold = (isset($row['checkEmailHold']) && $row['checkEmailHold']);    
     ?>
     <? if (isset($row['barcode']) && $row['barcode'] != ""): ?>
diff --git a/themes/finc/templates/header.phtml b/themes/finc/templates/header.phtml
index 3410e524708d52d92f4103e7c6c94fa30699be46..3836d382cabb173684fd11104b296fa9af912ac7 100644
--- a/themes/finc/templates/header.phtml
+++ b/themes/finc/templates/header.phtml
@@ -8,7 +8,7 @@
     <? /*Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone */ ?>
     <li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li>
   </ul>
-  <section class="top-bar-section">
+  <section class="top-bar-section" id="searchslots">
     <? if ($this->layout()->searchbox !== false): ?>
       <ul class="left list-unstyled show-for-medium-up">
         <li>