diff --git a/include/category_subcats.inc.php b/include/category_subcats.inc.php
index 02a2b214b..578cabde6 100644
--- a/include/category_subcats.inc.php
+++ b/include/category_subcats.inc.php
@@ -161,7 +161,7 @@ SELECT id, path, tn_ext
             ),
           'NAME' => htmlentities($category['name'],ENT_QUOTES),
           'CAPTION_NB_IMAGES' => (($category['nb_images'] == 0) ? '' : sprintf("%d ".l10n('pictures'), $category['nb_images'])),
-          'DESCRIPTION' => @$category['comment'],ENT_QUOTES,
+          'DESCRIPTION' => @$category['comment'],
           )
         );
     }
diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index 62cfd7a13..01f7afb29 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -158,6 +158,7 @@ FORM.filter FIELDSET LI LABEL {
 FORM.filter FIELDSET UL.tagSelection LABEL {
   display: inline;
   float: none;
+  margin-right:0.5em;/*reduce from above*/
 }
 
 /* cannot use FIELDSET>LABEL because of IE<=6 */
@@ -179,6 +180,10 @@ FORM.filter FIELDSET LABEL SPAN TEXTAREA {
   margin: 0 0.5em 0 0;
 }
 
+FORM.filter FIELDSET UL.tagSelection LI LABEL INPUT {
+  margin-right:0;
+}
+
 /* following declaration is important to avoid strange FF behaviour */
 FORM.filter FIELDSET LABEL SPAN SELECT {
   margin: 0;
diff --git a/template/yoga/search.tpl b/template/yoga/search.tpl
index 8de689664..5fde2adcb 100644
--- a/template/yoga/search.tpl
+++ b/template/yoga/search.tpl
@@ -70,7 +70,7 @@
       <input name="start_year" type="text" size="4" maxlength="4" onfocus="this.className='focus';" onblur="this.className='nofocus';">
     </li>
     <li>
-      <a href="#" onClick="document.search.start_day.value={TODAY_DAY};document.search.start_month.value={TODAY_MONTH};document.search.start_year.value={TODAY_YEAR};">{lang:today}</a>
+      <a href="#" onClick="document.search.start_day.value={TODAY_DAY};document.search.start_month.value={TODAY_MONTH};document.search.start_year.value={TODAY_YEAR};return false;">{lang:today}</a>
     </li>
   </ul>
   <ul>
@@ -89,7 +89,7 @@
       <input name="end_year" type="text" size="4" maxlength="4" onfocus="this.className='focus';" onblur="this.className='nofocus';">
     </li>
     <li>
-      <a href="#" onClick="document.search.end_day.value={TODAY_DAY};document.search.end_month.value={TODAY_MONTH};document.search.end_year.value={TODAY_YEAR};">{lang:today}</a>
+      <a href="#" onClick="document.search.end_day.value={TODAY_DAY};document.search.end_month.value={TODAY_MONTH};document.search.end_year.value={TODAY_YEAR};return false;">{lang:today}</a>
     </li>
   </ul>
 </fieldset>