diff --git a/themes/bootstrap/templates/search/advanced/limit.phtml b/themes/bootstrap/templates/search/advanced/limit.phtml
index 35dcc457892ed8bd82b84e09c943e93cdc92f32b..64460745b0063cd83fc48e9c6c8f79156dee7a5f 100644
--- a/themes/bootstrap/templates/search/advanced/limit.phtml
+++ b/themes/bootstrap/templates/search/advanced/limit.phtml
@@ -6,7 +6,7 @@
     $lastLimit = $this->options->getLastLimit();
     $defaultLimit = empty($lastLimit) ? $this->options->getDefaultLimit() : $lastLimit;
 ?>
-<? if (count($limitList) > 1): ?>
+<? if (!empty($limitList)): ?>
   <fieldset class="span4">
     <legend><?=$this->transEsc('Results per page')?></legend>
     <select id="limit" name="limit">
diff --git a/themes/bootstrap/templates/search/advanced/solr.phtml b/themes/bootstrap/templates/search/advanced/solr.phtml
index 27a45ef7f333d58bea6e9711e001088165ef12eb..9c78ef71d193198f5ed2ec9afc0365a5953c06ee 100644
--- a/themes/bootstrap/templates/search/advanced/solr.phtml
+++ b/themes/bootstrap/templates/search/advanced/solr.phtml
@@ -2,7 +2,7 @@
   <p class="lead"><?=$this->transEsc('Limit To')?></p>
   <div class="row-fluid">
     <? foreach ($this->facetList as $field => $list): ?>
-      <div class="span4">
+      <div class="span<?=floor(12/count($this->facetList)) ?>">
         <label class="displayBlock" for="limit_<?=$this->escapeHtml(str_replace(' ', '', $field))?>"><?=$this->transEsc($list['label'])?>:</label>
         <select class="span12" id="limit_<?=$this->escapeHtml(str_replace(' ', '', $field))?>" name="filter[]" multiple="multiple" size="10">
           <?