diff --git a/webui/controller/search/load.php b/webui/controller/search/load.php
index b4cdca9..3f94db6 100644
--- a/webui/controller/search/load.php
+++ b/webui/controller/search/load.php
@@ -19,8 +19,6 @@
       $this->load->model('search/message');
       $this->load->model('user/user');
 
-      if($this->data['hits_to'] > $this->data['n']) { $this->data['hits_to'] = $this->data['n']; }
-
       $this->data['terms'] = $this->model_search_search->get_search_terms();
 
       $this->render();
diff --git a/webui/model/search/message.php b/webui/model/search/message.php
index 24dd710..3bc751e 100644
--- a/webui/model/search/message.php
+++ b/webui/model/search/message.php
@@ -224,7 +224,7 @@
       }
 
       if($charset && !preg_match("/utf-8/i", $charset)){
-         $s = iconv($charset, 'utf-8', $chunk);
+         $s = @iconv($charset, 'utf-8', $chunk);
          if($s) { $chunk = $s; $s = ''; }
       }
 
diff --git a/webui/view/theme/default/templates/common/layout-new.tpl b/webui/view/theme/default/templates/common/layout-new.tpl
index d5a5982..89cafc6 100644
--- a/webui/view/theme/default/templates/common/layout-new.tpl
+++ b/webui/view/theme/default/templates/common/layout-new.tpl
@@ -63,6 +63,14 @@
         'target':document
       });
 
+      shortcut.add("Enter", function() {
+        var a=document.getElementById('ref'); if(a) a.value=''; load_search_results('<?php print SEARCH_HELPER_URL; ?>', assemble_search_term(count, ''), 0);
+      },{
+        'type':'keydown',
+        'propagate':true,
+        'target':document
+      });
+
 
    </script>
 
diff --git a/webui/view/theme/default/templates/search/load.tpl b/webui/view/theme/default/templates/search/load.tpl
index 5524efd..9ff456f 100644
--- a/webui/view/theme/default/templates/search/load.tpl
+++ b/webui/view/theme/default/templates/search/load.tpl
@@ -13,11 +13,12 @@
 
 <?php foreach($terms as $term) {
          parse_str($term['term'], $s);
+         if(isset($s['search'])) {
 ?>
          <div class="resultrow">
             <a href="#" onclick="javascript:load_search_results('<?php print SEARCH_HELPER_URL; ?>', '<?php print $term['term']; ?>', 0); var a=document.getElementById('_search'); var v=decodeURIComponent('<?php print urlencode($s['search']); ?>'); v = v.replace(/\+/g, ' '); a.value=v; "><?php print $s['search']; ?></a></br />
          </div>
-<?php } ?>
+<?php } } ?>
 
        </div>
    </div>
@@ -25,6 +26,4 @@
 
 <?php
 
-//print_r($terms);
-
 ?>