diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 1bea0cbb0..207756afd 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -378,18 +378,10 @@ if ($_SESSION['userlevel'] >= '5' && ($routing_count['bgp']+$routing_count['ospf
 <?php
 }
 
-$packages = dbFetchCell("SELECT COUNT(pkg_id) from `packages`");
-
-if ($packages)
-{
+if ( dbFetchCell("SELECT 1 from `packages` LIMIT 1") ) {
 ?>
-
-        <li class="dropdown">
-          <a href="<?php echo(generate_url(array('page'=>'packages'))); ?>" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><img src="images/16/box.png" border="0" align="absmiddle" /> Packages<b class="caret"></b></a>
-          <ul class="dropdown-menu">
-            <li><a href="<?php echo(generate_url(array('page'=>'search','search'=>'packages'))); ?>"><img src="images/16/box.png" border="0" align="absmiddle" /> Search Packages</a></li>
-            <li><a href="<?php echo(generate_url(array('page'=>'packages'))); ?>"><img src="images/16/box.png" border="0" align="absmiddle" /> All Packages</a></li>
-          </ul>
+        <li>
+          <a href="<?php echo(generate_url(array('page'=>'search','search'=>'packages'))); ?>"><img src="images/16/box.png" border="0" align="absmiddle" /> Packages</a>
         </li>
 <?php
 } # if ($packages)
diff --git a/html/pages/search.inc.php b/html/pages/search.inc.php
index bd2918bf1..c9fda8de9 100644
--- a/html/pages/search.inc.php
+++ b/html/pages/search.inc.php
@@ -2,7 +2,11 @@
 
 $pagetitle[] = "Search";
 
-$sections = array('packages' => 'Packages', 'ipv4' => 'IPv4 Address', 'ipv6' => 'IPv6 Address', 'mac' => 'MAC Address', 'arp' => 'ARP Table');
+$sections = array('ipv4' => 'IPv4 Address', 'ipv6' => 'IPv6 Address', 'mac' => 'MAC Address', 'arp' => 'ARP Table');
+
+if( dbFetchCell("SELECT 1 from `packages` LIMIT 1") ) {
+  $sections['packages'] = 'Packages';
+}
 
 if (!isset($vars['search'])) { $vars['search'] = "ipv4"; }
 
@@ -30,18 +34,10 @@ unset ($sep);
 
 print_optionbar_end('', '');
 
-switch ($vars['search'])
-{
-  case 'packages':
-  case 'ipv4':
-  case 'ipv6':
-  case 'mac':
-  case 'arp':
-    include('pages/search/'.$vars['search'].'.inc.php');
-    break;
-  default:
-    echo(report_this('Unknown search type '.$vars['search']));
-    break;
+if( file_exists('pages/search/'.$vars['search'].'.inc.php') ) {
+  include('pages/search/'.$vars['search'].'.inc.php');
+} else {
+  echo(report_this('Unknown search type '.$vars['search']));
 }
 
 ?>
diff --git a/html/pages/search/packages.inc.php b/html/pages/search/packages.inc.php
index 67f969b88..20b463d56 100644
--- a/html/pages/search/packages.inc.php
+++ b/html/pages/search/packages.inc.php
@@ -26,7 +26,7 @@ print_optionbar_start(28);
 ?>
 <form method="post" action="" class="form-inline" role="form">
 	<div class="form-group">
-		<label for="package">Name</label>
+		<label for="package">Package</label>
 		<input type="text" name="package" id="package" size=20 value="<?php echo($_POST['package']); ?>" class="form-control input-sm" placeholder="Any" />
 	</div>
 	<div class="form-group">
@@ -130,6 +130,7 @@ foreach( $ordered as $name=>$entry ) {
 	$arch = array();
 	$devs = array();
 	foreach( $entry as $variation ) {
+		$variation['version'] = str_replace(":",".",$variation['version']);
 		if( !in_array($variation['version'], $vers) && (empty($ver) || version_compare($variation['version'],$ver,$opt)) ) {
 			$vers[] = $variation['version'];
 		}