diff --git a/.gitignore b/.gitignore
index 1ab6481..cb49ca3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,7 @@
 /app/design/frontend/base/default/layout/*.xml
 /app/design/frontend/base/default/layout/sales
 /app/design/frontend/base/default/template/*
-!/app/design/frontend/base/default/template/solarium
+!/app/design/frontend/base/default/template/jeroenvermeulen
 /app/design/frontend/default
 /app/design/install
 /app/etc/modules/Cm_*
diff --git a/app/code/community/JeroenVermeulen/Solarium/Model/Engine.php b/app/code/community/JeroenVermeulen/Solarium/Model/Engine.php
index 26ab76c..d59e317 100644
--- a/app/code/community/JeroenVermeulen/Solarium/Model/Engine.php
+++ b/app/code/community/JeroenVermeulen/Solarium/Model/Engine.php
@@ -492,7 +492,8 @@ public function search( $storeId, $queryString, $try = 1 ) {
                     }
                     arsort( $suggest, SORT_NUMERIC );
                     if ( $doAutoCorrect && empty($result) && !empty($suggest) ) {
-                        $bestMatch = reset( array_keys($suggest) );
+                        $suggestKeys = array_keys($suggest);
+                        $bestMatch = reset($suggestKeys);
                         array_shift($suggest);
                         $result = $this->search( $storeId, $bestMatch, $try+1 );
                     }
diff --git a/app/design/frontend/base/default/layout/jeroenvermeulen/solarium.xml b/app/design/frontend/base/default/layout/jeroenvermeulen/solarium.xml
index 1d51a14..3bdc868 100644
--- a/app/design/frontend/base/default/layout/jeroenvermeulen/solarium.xml
+++ b/app/design/frontend/base/default/layout/jeroenvermeulen/solarium.xml
@@ -32,7 +32,7 @@
     </default>
     <catalogsearch_result_index>
         <reference name="content">
-            <block type="core/template" template="solarium/suggest.phtml" before="-" />
+            <block type="core/template" template="jeroenvermeulen/solarium/suggest.phtml" before="-" />
         </reference>
     </catalogsearch_result_index>
 </layout>
\ No newline at end of file
diff --git a/app/design/frontend/base/default/template/jeroenvermeulen/solarium/suggest.phtml b/app/design/frontend/base/default/template/jeroenvermeulen/solarium/suggest.phtml
new file mode 100644
index 0000000..791f46c
--- /dev/null
+++ b/app/design/frontend/base/default/template/jeroenvermeulen/solarium/suggest.phtml
@@ -0,0 +1,19 @@
+<?php if ($suggestions = Mage::registry('solarium_suggest')): ?>
+    <ul class="messages">
+        <li class="notice-msg">
+            <ul>
+                <li><span>
+                <?php echo Mage::helper('jeroenvermeulen_solarium')->__('Did you mean: '); ?>
+                        <?php $counter = 0; ?>
+                        <?php foreach ($suggestions as $suggestion => $result_count): ?>
+                            <?php $counter++; if ( 1 < $counter ): ?>&nbsp;<?php endif; ?>
+                            <a title="<?php echo $this->__('Results').':'.$result_count; ?>"
+                               href="<?php echo Mage::getUrl('catalogsearch/result', array('q' => $suggestion)); ?>">
+                                <?php echo $suggestion ?></a>
+                        <?php endforeach; ?>
+        </span></li>
+            </ul>
+        </li>
+    </ul>
+    <?php Mage::unregister('solarium_suggest'); ?>
+<?php endif; ?>
\ No newline at end of file
diff --git a/app/design/frontend/base/default/template/solarium/suggest.phtml b/app/design/frontend/base/default/template/solarium/suggest.phtml
deleted file mode 100644
index 1994163..0000000
--- a/app/design/frontend/base/default/template/solarium/suggest.phtml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-$counter = 0;
-if ($suggestions = Mage::registry('solarium_suggest')): ?>
-    <ul class="messages">
-        <li class="notice-msg">
-            <ul>
-                <li><span>
-                <?php echo Mage::helper('jeroenvermeulen_solarium')->__('Did you mean: '); ?>
-                        <?php foreach ($suggestions as $suggestion): ?>
-                                <a href="<?php echo Mage::getUrl('catalogsearch/result', array('q' => $suggestion)); ?>"><?php echo $suggestion ?></a>
-                        <?php endforeach; ?>
-        </span></li>
-            </ul>
-        </li>
-    </ul>
-    <?php Mage::unregister('solarium_suggest'); ?>
-<?php endif; ?>
\ No newline at end of file
diff --git a/modman b/modman
index 30f14fc..816ccba 100644
--- a/modman
+++ b/modman
@@ -1,31 +1,45 @@
 ## JeroenVermeulen_Solarium Extension - Solr search for Magento CE
 
-# Magento User Interface - File                 == Frontend layout
+# ---- Frontend layout
+# Magento User Interface       - File          - frontend/base/default/layout/jeroenvermeulen/solarium.xml
 app/design/frontend/base/default/layout/jeroenvermeulen/solarium.xml        app/design/frontend/base/default/layout/jeroenvermeulen/solarium.xml
 
-# Magento User Interface - File                 == Backend layout
+# ---- Frontend layout
+# Magento User Interface       - Recursive Dir - frontend/base/default/template/jeroenvermeulen/solarium
+app/design/frontend/base/default/template/jeroenvermeulen/solarium/         app/design/frontend/base/default/template/jeroenvermeulen/solarium/
+
+# ---- Backend layout
+# Magento User Interface       - File          - adminhtml/default/default/layout/jeroenvermeulen/solarium.xml
 app/design/adminhtml/default/default/layout/jeroenvermeulen/solarium.xml    app/design/adminhtml/base/default/layout/jeroenvermeulen/solarium.xml
 
-# Magento Global Config - File                  == Module enable XML
+# ---- Module enable XML
+# Magento Global Config        - File          - modules/JeroenVermeulen_Solarium.xml
 app/etc/modules/JeroenVermeulen_Solarium.xml                                app/etc/modules/JeroenVermeulen_Solarium.xml
 
-# Magento Other web accessible - Recursive Dir  == JavaScript libraries
+# ---- JavaScript libraries
+# Magento Other web accessible - Recursive Dir - js/solarium
 js/solarium/                                                                js/solarium/
 
-# Magento PHP Library file - Recursive Dir      == The Solarium Library, by Bas de Nooijer
+# ---- The Solarium Library, by Bas de Nooijer
+# Magento PHP Library file     - Recursive Dir - Solarium
 lib/Solarium/                                                               lib/Solarium/
 
-# Magento PHP Library file - Recursive Dir      == The EventDispatcher component from the Symfony framework
+# ---- The EventDispatcher component from the Symfony framework
+# Magento PHP Library file     - Recursive Dir - Symfony/Component/EventDispatcher
 lib/Symfony/Component/EventDispatcher/                                      lib/Symfony/Component/EventDispatcher/
 
-# Magento Theme Skin - File                     == Backend CSS file
+# ---- Backend CSS file
+# Magento Theme Skin           - File          - adminhtml/default/default/css/jeroenvermeulen/solarium.css
 skin/adminhtml/default/default/css/jeroenvermeulen/solarium.css             skin/adminhtml/default/default/css/jeroenvermeulen/solarium.css
 
-# Magento Theme Skin - Recursive Dir            == Backend image files
+# ---- Backend image files
+# Magento Theme Skin           - Recursive Dir - adminhtml/default/default/images/jeroenvermeulen/solarium
 skin/adminhtml/default/default/images/jeroenvermeulen/solarium/             skin/adminhtml/default/default/images/jeroenvermeulen/solarium/
 
-# Magento Community Module - Recursive Dir      == Extension code dir
+# ---- Extension code dir
+# Magento Community Module     - Recursive Dir - JeroenVermeulen/Solarium
 app/code/community/JeroenVermeulen/Solarium/                                app/code/community/JeroenVermeulen/Solarium/
 
-# Magento Locale language - File                == Dutch translation
+# ---- Dutch translation
+# Magento Locale language      - File          - nl_NL/JeroenVermeulen_Solarium.csv
 app/locale/nl_NL/JeroenVermeulen_Solarium.csv                               app/locale/nl_NL/JeroenVermeulen_Solarium.csv
diff --git a/var/connect/JeroenVermeulen_Solarium-1.6.1.tgz b/var/connect/JeroenVermeulen_Solarium-1.6.1.tgz
new file mode 100644
index 0000000..04e263b
Binary files /dev/null and b/var/connect/JeroenVermeulen_Solarium-1.6.1.tgz differ
diff --git a/var/connect/JeroenVermeulen_Solarium.xml b/var/connect/JeroenVermeulen_Solarium.xml
index 12d4dcc..f4e487f 100644
--- a/var/connect/JeroenVermeulen_Solarium.xml
+++ b/var/connect/JeroenVermeulen_Solarium.xml
@@ -1,5 +1,5 @@
 <_>
-   <form_key>F1ORDmSGZQ9dcoTC</form_key>
+   <form_key>mvNLLfGbn8YS6sdV</form_key>
    <name>JeroenVermeulen_Solarium</name>
    <channel>community</channel>
    <version_ids>
@@ -22,21 +22,23 @@ Report bugs: https://github.com/jeroenvermeulen/magento-solarium/issues
 </description>
    <license>OSL-3.0</license>
    <license_uri>http://opensource.org/licenses/osl-3.0.php</license_uri>
-   <version>1.5.0</version>
-   <stability>stable</stability>
-   <notes>  * The first &quot;stable&quot; version
-  * Added &quot;Test Connection&quot; button to configuration
-  * Added logos to configuration - Thanks @toonvd
-  * Added Dutch translations</notes>
+   <version>1.6.1</version>
+   <stability>beta</stability>
+   <notes>WARNING: Beta version, do not use on production without extensive testing.
+
+  * Bugfix for &quot;Did you mean&quot; html</notes>
    <authors>
       <name>
          <name>Jeroen Vermeulen BVBA</name>
+         <name>Toon van Dooren</name>
       </name>
       <user>
          <user>jeroenvermeulen</user>
+         <user>toonvd</user>
       </user>
       <email>
          <email>info@jeroenvermeulen.eu</email>
+         <email>toon_vd@live.com</email>
       </email>
    </authors>
    <depends_php_min>5.3.0</depends_php_min>
@@ -56,7 +58,7 @@ Report bugs: https://github.com/jeroenvermeulen/magento-solarium/issues
             <max/>
          </max>
          <files>
-            <files>                                                  </files>
+            <files>                                                                </files>
          </files>
       </package>
       <extension>
@@ -76,6 +78,7 @@ Report bugs: https://github.com/jeroenvermeulen/magento-solarium/issues
          <target>magecommunity</target>
          <target>magedesign</target>
          <target>magedesign</target>
+         <target>magedesign</target>
          <target>mageetc</target>
          <target>mageweb</target>
          <target>magelib</target>
@@ -88,6 +91,7 @@ Report bugs: https://github.com/jeroenvermeulen/magento-solarium/issues
       <path>
          <path>JeroenVermeulen/Solarium</path>
          <path>frontend/base/default/layout/jeroenvermeulen/solarium.xml</path>
+         <path>frontend/base/default/template/jeroenvermeulen/solarium</path>
          <path>adminhtml/default/default/layout/jeroenvermeulen/solarium.xml</path>
          <path>modules/JeroenVermeulen_Solarium.xml</path>
          <path>js/solarium</path>
@@ -101,6 +105,7 @@ Report bugs: https://github.com/jeroenvermeulen/magento-solarium/issues
       <type>
          <type>dir</type>
          <type>file</type>
+         <type>dir</type>
          <type>file</type>
          <type>file</type>
          <type>dir</type>
@@ -123,6 +128,7 @@ Report bugs: https://github.com/jeroenvermeulen/magento-solarium/issues
          <include/>
          <include/>
          <include/>
+         <include/>
       </include>
       <ignore>
          <ignore/>
@@ -136,6 +142,7 @@ Report bugs: https://github.com/jeroenvermeulen/magento-solarium/issues
          <ignore/>
          <ignore/>
          <ignore/>
+         <ignore/>
       </ignore>
    </contents>
 </_>