diff --git a/phpgwapi/templates/idots/nextmatchs.tpl b/phpgwapi/templates/idots/nextmatchs.tpl
index 76eda1c385..6829dde6dc 100755
--- a/phpgwapi/templates/idots/nextmatchs.tpl
+++ b/phpgwapi/templates/idots/nextmatchs.tpl
@@ -52,9 +52,7 @@
 
 
 <!-- BEGIN search -->
-       <td>
         <input type="text" name="query" value="{query_value}">&nbsp;{searchby}<input type="submit" name="Search" value="{lang_search}">
-       </td>
 <!-- END search -->
 
 <!-- BEGIN cats -->
@@ -76,7 +74,10 @@
       <input type="hidden" name="order" value="{order_value}">
       <input type="hidden" name="sort" value="{sort_value}">
       <input type="hidden" name="query" value="{query_value}">
-      <tr>{search}<td>&nbsp;</td>{filter}
+      <tr>
+      		<td>{search}</td>
+      		<td>&nbsp;</td>
+      		{filter}
       </tr>
      </form>
     </table>
@@ -91,7 +92,12 @@
       <input type="hidden" name="order" value="{order_value}">
       <input type="hidden" name="sort" value="{sort_value}">
       <input type="hidden" name="query" value="{query_value}">
-      <tr>{cats}<td>&nbsp;</td>{search}<td>&nbsp;&nbsp;</td>{filter}
+      <tr>
+      		{cats}
+      		<td>&nbsp;</td>
+      		<td>{search}</td>
+      		<td>&nbsp;&nbsp;</td>
+      		{filter}
       </tr>
      </form>
     </table>