diff --git a/models.py b/models.py
index 4e6cdd0..cbbf394 100644
--- a/models.py
+++ b/models.py
@@ -262,6 +262,7 @@ class Post(models.Model):
         my_tags = []
         # Create new tags
         for tag in tags.split(','):
+            if tag == '': continue
             tag_slug = slugify(tag)
             found = False
             for t in tags_list:
@@ -277,6 +278,7 @@ class Post(models.Model):
         # Add new tags
         post_tags_list = Tag.objects.filter(post=self.id)
         for tag in tags.split(','):
+            if tag == '': continue
             tag_slug = slugify(tag)
             found = False
             for t in post_tags_list:
@@ -291,16 +293,20 @@ class Post(models.Model):
                         break
 
         # Remove old tags
-        for t in post_tags_list:
-            found = False
-            for tag in tags.split(','):
-                tag_slug = slugify(tag)
-                if t.name_slug == tag_slug:
-                    found = True
-                    break
-            if not found:
-                # print 'Remove ' + t.name_slug
+        if tags == '':
+            for t in post_tags_list:
                 self.tags.remove(t)
+        else:
+            for t in post_tags_list:
+                found = False
+                for tag in tags.split(','):
+                    tag_slug = slugify(tag)
+                    if t.name_slug == tag_slug:
+                        found = True
+                        break
+                if not found:
+                # print 'Remove ' + t.name_slug
+                    self.tags.remove(t)
 
         self.save()
 
diff --git a/sites/blog.soutade.fr/_base.html b/sites/blog.soutade.fr/_base.html
index 2a35b3c..0b7330a 100755
--- a/sites/blog.soutade.fr/_base.html
+++ b/sites/blog.soutade.fr/_base.html
@@ -28,7 +28,7 @@
 	    <div class="menu_content_header">Recherche</div>
 	    <div id="menu_main">
 	      <dyn:replace div_name="form" id="search_form" method="POST" action="/search/dyn:blog_id">
-		<input type="text" name="text" onkeypress="handleKeyPress(event,this.form)"/>
+		<input type="text" name="text" id="search_text" onkeypress="handleKeyPress(event,this.form)"/>
 	      </dyn:replace>
 	    </div>
 	  </div>
diff --git a/sites/blog.soutade.fr/_search.html b/sites/blog.soutade.fr/_search.html
new file mode 100755
index 0000000..e770671
--- /dev/null
+++ b/sites/blog.soutade.fr/_search.html
@@ -0,0 +1,12 @@
+<dyn:base file="_base.html" block="content" xmlns:dyn="http://indefero.soutade.fr/p/dynastie">
+  <dyn:posts limit="25">
+    <div class="post_header">
+      <dyn:title/>
+      <div class="post_sub_header">
+	<dyn:date/> | <div class="author_icon"> Écrit par <dyn:author/> </div>
+      </div>
+      <dyn:tags link="1"/>
+    </div>
+    <dyn:post_content/>
+  </dyn:posts>
+</dyn:base>
diff --git a/sites/blog.soutade.fr/css/blog.css b/sites/blog.soutade.fr/css/blog.css
index c301cd1..9347c04 100755
--- a/sites/blog.soutade.fr/css/blog.css
+++ b/sites/blog.soutade.fr/css/blog.css
@@ -449,3 +449,8 @@ ul li
     padding:0;
     margin:0;
 }
+
+#search_text
+{
+    width:100%;
+}
\ No newline at end of file