diff --git a/search.php b/search.php
index f9d20154f..be2607196 100644
--- a/search.php
+++ b/search.php
@@ -221,7 +221,7 @@ SELECT
     array(
       'forbidden_categories' => 'category_id',
       'visible_categories' => 'category_id',
-      'visible_images' => 'ic.image_id'
+      'visible_images' => 'id'
       ),
     ' WHERE '
     ).'
diff --git a/themes/default/template/comments.tpl b/themes/default/template/comments.tpl
index 0ffef1fa9..96f42b09b 100644
--- a/themes/default/template/comments.tpl
+++ b/themes/default/template/comments.tpl
@@ -14,24 +14,46 @@
   <fieldset>
     <legend>{'Filter'|@translate}</legend>
 
-    <label>{'Keyword'|@translate}<input type="text" name="keyword" value="{$F_KEYWORD}"></label>
+		<ul>
+			<li>
+				<label>{'Keyword'|@translate}</label>
+			</li>
+			<li>
+				<input type="text" name="keyword" value="{$F_KEYWORD}">
+			</li>
+		</ul>
 
-    <label>{'Author'|@translate}<input type="text" name="author" value="{$F_AUTHOR}"></label>
+		<ul>
+			<li>
+				<label>{'Author'|@translate}</label>
+			</li>
+			<li>
+				<input type="text" name="author" value="{$F_AUTHOR}">
+			</li>
+		</ul>
 
-    <label>
-      {'Album'|@translate}
-      <select name="cat">
-        <option value="0">------------</option>
-        {html_options options=$categories selected=$categories_selected}
-      </select>
-    </label>
+		<ul>
+			<li>
+				<label>{'Album'|@translate}</label>
+			</li>
+			<li>
+				<select name="cat">
+					<option value="0">------------</option>
+					{html_options options=$categories selected=$categories_selected}
+				</select>
+			</li>
+		</ul>
 
-    <label>
-      {'Since'|@translate}
-      <select name="since">
-        {html_options options=$since_options selected=$since_options_selected}
-      </select>
-    </label>
+		<ul>
+			<li>
+				<label>{'Since'|@translate}</label>
+			</li>
+			<li>
+				<select name="since">
+					{html_options options=$since_options selected=$since_options_selected}
+				</select>
+			</li>
+		</ul>
 
   </fieldset>
 
@@ -39,26 +61,38 @@
 
     <legend>{'Display'|@translate}</legend>
 
-    <label>
-      {'Sort by'|@translate}
-      <select name="sort_by">
-        {html_options options=$sort_by_options selected=$sort_by_options_selected}
-      </select>
-    </label>
+		<ul>
+			<li>
+				<label>{'Sort by'|@translate}</label>
+			</li>
+			<li>
+				<select name="sort_by">
+					{html_options options=$sort_by_options selected=$sort_by_options_selected}
+				</select>
+			</li>
+		</ul>
 
-    <label>
-      {'Sort order'|@translate}
-      <select name="sort_order">
-        {html_options options=$sort_order_options selected=$sort_order_options_selected}
-      </select>
-    </label>
+		<ul>
+			<li>
+				<label>{'Sort order'|@translate}</label>
+			</li>
+			<li>
+				<select name="sort_order">
+					{html_options options=$sort_order_options selected=$sort_order_options_selected}
+				</select>
+			</li>
+		</ul>
 
-    <label>
-      {'Number of items'|@translate}
-      <select name="items_number">
-        {html_options options=$item_number_options selected=$item_number_options_selected}
-      </select>
-    </label>
+		<ul>
+			<li>
+				<label>{'Number of items'|@translate}</label>
+			</li>
+			<li>
+				<select name="items_number">
+					{html_options options=$item_number_options selected=$item_number_options_selected}
+				</select>
+			</li>
+		</ul>
 
   </fieldset>
 
diff --git a/themes/default/template/search.tpl b/themes/default/template/search.tpl
index b9d712cee..acec2ebd1 100644
--- a/themes/default/template/search.tpl
+++ b/themes/default/template/search.tpl
@@ -48,6 +48,7 @@ jQuery(document).ready(function() {
 
 </fieldset>
 
+{if count($AUTHORS)>1}
 <fieldset>
   <legend>{'Search for Author'|@translate}</legend>
   <p>
@@ -58,6 +59,7 @@ jQuery(document).ready(function() {
     </select>
   </p>
 </fieldset>
+{/if}
 
 {if isset($TAGS)}
 <fieldset>
@@ -135,8 +137,8 @@ jQuery(document).ready(function() {
   </p>
 </fieldset>
 <p>
-  <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}">
-  <input class="submit" type="reset" value="{'Reset'|@translate}">
+  <input type="submit" name="submit" value="{'Submit'|@translate}">
+  <input type="reset" value="{'Reset'|@translate}">
 </p>
 </form>
 
diff --git a/themes/default/theme.css b/themes/default/theme.css
index f31d7a31e..9fa267473 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -493,11 +493,6 @@ FORM P {
 	margin-bottom: 2em;
 }
 
-SELECT.categoryList {
-	height: 20em;
-	width: 500px;
-}
-
 
 /**
  * Filter forms are displayed label by label with the input (or select...)
@@ -512,7 +507,7 @@ FIELDSET {
 .filter UL {
 	display: block;
 	float: left;
-	margin-right: 1em;
+	margin: 0 1em 1em 0;
 	padding: 0;
 }
 
@@ -525,11 +520,6 @@ FIELDSET {
   padding-bottom:0;
 }
 
-.filter LI LABEL {
-	display: inline;
-	float: none;
-}
-
 .filter P {
   text-align:left;
   margin:0 0 15px 0;
@@ -553,18 +543,6 @@ FIELDSET {
   margin-right:1em;
 }
 
-/*IE6 needs override because of > selector*/
-.filter LABEL>INPUT,
-.filter LABEL>SELECT {
-	/* display: block; */
-	margin: 0.5em 0;
-}
-
-.filter FIELDSET * LABEL>INPUT {
-	display: inline;
-	vertical-align: top;
-	margin: 0 0.5em 0 0;
-}
 
 
 .properties UL {