diff --git a/zivimap/locale/de/LC_MESSAGES/django.po b/zivimap/locale/de/LC_MESSAGES/django.po
index 3ba0e5d..c5e0f97 100644
--- a/zivimap/locale/de/LC_MESSAGES/django.po
+++ b/zivimap/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-18 17:50+0100\n"
+"POT-Creation-Date: 2013-03-05 12:45+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,51 +18,60 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: models.py:30
+#: models.py:32
 msgid "Health"
 msgstr "Gesundheitswesen"
 
-#: models.py:30
+#: models.py:32
 msgid "Social"
 msgstr "Sozialwesen"
 
-#: models.py:31
+#: models.py:33
 msgid "Culture"
 msgstr "Kulturgütererhaltung"
 
-#: models.py:31
+#: models.py:33
 msgid "Nature protection"
 msgstr "Umwelt- und Naturschutz"
 
-#: models.py:32
+#: models.py:34
 msgid "Forest work"
 msgstr "Forstwesen"
 
-#: models.py:32
+#: models.py:34
 msgid "Agriculture"
 msgstr "Landwirtschaft"
 
-#: models.py:33
+#: models.py:35
 msgid "Development & cooperation"
 msgstr "Entwicklungszusammenar..."
 
-#: models.py:34
+#: models.py:36
 msgid "Disasters help"
 msgstr "Bewältigung von Katast..."
 
-#: views.py:24
+#: views.py:29 templates/search_form.html:9
 msgid "Domains"
 msgstr "Tätigkeitsbereich"
 
-#: views.py:28
+#: views.py:33 templates/search_form.html:15
 msgid "Languages"
 msgstr "Sprache"
 
-#: templates/base.html:14 templates/base.html.py:26
-msgid "swiss civilian service search"
-msgstr "Schweizer zivildienst einsatz suche"
+#: views.py:41 templates/search_form.html:21
+msgid "Earliest start"
+msgstr "Frühester Start"
+
+#: views.py:45 templates/search_form.html:27
+msgid "Latest end"
+msgstr "Spätestes Ende"
 
-#: templates/base.html:58
+#: templates/base.html:16 templates/base.html.py:28
+#, fuzzy
+msgid "(non-official) swiss civilian service search"
+msgstr "Schweizer zivildienst einsatz suche (inoffiziell)"
+
+#: templates/base.html:60
 #, python-format
 msgid ""
 "\n"
@@ -76,11 +85,14 @@ msgid ""
 "      "
 msgstr ""
 
-#: templates/index.html:45
+#: templates/index.html:42
 #, fuzzy
 msgid "Search options"
 msgstr "Suchen"
 
-#: templates/index.html:50
+#: templates/index.html:46
 msgid "Search"
 msgstr "Suchen"
+
+#~ msgid "swiss civilian service search"
+#~ msgstr "Schweizer zivildienst einsatz suche"
diff --git a/zivimap/locale/en/LC_MESSAGES/django.po b/zivimap/locale/en/LC_MESSAGES/django.po
index 26f1a6c..7d2dfa5 100644
--- a/zivimap/locale/en/LC_MESSAGES/django.po
+++ b/zivimap/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-18 17:50+0100\n"
+"POT-Creation-Date: 2013-03-05 12:45+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,51 +17,59 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: models.py:30
+#: models.py:32
 msgid "Health"
 msgstr ""
 
-#: models.py:30
+#: models.py:32
 msgid "Social"
 msgstr ""
 
-#: models.py:31
+#: models.py:33
 msgid "Culture"
 msgstr ""
 
-#: models.py:31
+#: models.py:33
 msgid "Nature protection"
 msgstr ""
 
-#: models.py:32
+#: models.py:34
 msgid "Forest work"
 msgstr ""
 
-#: models.py:32
+#: models.py:34
 msgid "Agriculture"
 msgstr ""
 
-#: models.py:33
+#: models.py:35
 msgid "Development & cooperation"
 msgstr ""
 
-#: models.py:34
+#: models.py:36
 msgid "Disasters help"
 msgstr ""
 
-#: views.py:24
+#: views.py:29 templates/search_form.html:9
 msgid "Domains"
 msgstr ""
 
-#: views.py:28
+#: views.py:33 templates/search_form.html:15
 msgid "Languages"
 msgstr ""
 
-#: templates/base.html:14 templates/base.html.py:26
-msgid "swiss civilian service search"
+#: views.py:41 templates/search_form.html:21
+msgid "Earliest start"
+msgstr ""
+
+#: views.py:45 templates/search_form.html:27
+msgid "Latest end"
+msgstr ""
+
+#: templates/base.html:16 templates/base.html.py:28
+msgid "(non-official) swiss civilian service search"
 msgstr ""
 
-#: templates/base.html:58
+#: templates/base.html:60
 #, python-format
 msgid ""
 "\n"
@@ -75,10 +83,10 @@ msgid ""
 "      "
 msgstr ""
 
-#: templates/index.html:45
+#: templates/index.html:42
 msgid "Search options"
 msgstr ""
 
-#: templates/index.html:50
+#: templates/index.html:46
 msgid "Search"
 msgstr ""
diff --git a/zivimap/locale/fr/LC_MESSAGES/django.po b/zivimap/locale/fr/LC_MESSAGES/django.po
index b358671..87a06ae 100644
--- a/zivimap/locale/fr/LC_MESSAGES/django.po
+++ b/zivimap/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-18 17:50+0100\n"
+"POT-Creation-Date: 2013-03-05 12:45+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,51 +18,60 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: models.py:30
+#: models.py:32
 msgid "Health"
 msgstr "Santé"
 
-#: models.py:30
+#: models.py:32
 msgid "Social"
 msgstr "Social"
 
-#: models.py:31
+#: models.py:33
 msgid "Culture"
 msgstr "Culture"
 
-#: models.py:31
+#: models.py:33
 msgid "Nature protection"
 msgstr "Protection de la nature"
 
-#: models.py:32
+#: models.py:34
 msgid "Forest work"
 msgstr "Travaux forestiers"
 
-#: models.py:32
+#: models.py:34
 msgid "Agriculture"
 msgstr "Agriculture"
 
-#: models.py:33
+#: models.py:35
 msgid "Development & cooperation"
 msgstr "Développement & coopéeration"
 
-#: models.py:34
+#: models.py:36
 msgid "Disasters help"
 msgstr "Aide en cas de catastrophe"
 
-#: views.py:24
+#: views.py:29 templates/search_form.html:9
 msgid "Domains"
 msgstr "Domaines"
 
-#: views.py:28
+#: views.py:33 templates/search_form.html:15
 msgid "Languages"
 msgstr "Langue"
 
-#: templates/base.html:14 templates/base.html.py:26
-msgid "swiss civilian service search"
-msgstr "recherche d'affectations pour le service civil suisse"
+#: views.py:41 templates/search_form.html:21
+msgid "Earliest start"
+msgstr "Début au plus tôt"
+
+#: views.py:45 templates/search_form.html:27
+msgid "Latest end"
+msgstr "Fin au plus tard"
 
-#: templates/base.html:58
+#: templates/base.html:16 templates/base.html.py:28
+#, fuzzy
+msgid "(non-official) swiss civilian service search"
+msgstr "recherche d'affectations pour le service civil suisse (non-officiel)"
+
+#: templates/base.html:60
 #, python-format
 msgid ""
 "\n"
@@ -86,10 +95,13 @@ msgstr ""
 "      Pour plus d'informations, cliques sur \"About\".\n"
 "      "
 
-#: templates/index.html:45
+#: templates/index.html:42
 msgid "Search options"
 msgstr "Options de recherche"
 
-#: templates/index.html:50
+#: templates/index.html:46
 msgid "Search"
 msgstr "Chercher"
+
+#~ msgid "swiss civilian service search"
+#~ msgstr "recherche d'affectations pour le service civil suisse"
diff --git a/zivimap/templates/base.html b/zivimap/templates/base.html
index 5ec4b7c..d40aefd 100644
--- a/zivimap/templates/base.html
+++ b/zivimap/templates/base.html
@@ -13,7 +13,7 @@
           rel="stylesheet" media="screen">
     <link href="http://code.jquery.com/ui/1.10.0/themes/base/jquery-ui.css"
           rel="stylesheet" media="screen">
-          <title>myzivi.ch | {% trans 'swiss civilian service search' %}</title>
+          <title>myzivi.ch | {% trans '(non-official) swiss civilian service search' %}</title>
   </head>
   <body>
     <div id="top_navbar" class="navbar navbar-inverse navbar-static-top">
@@ -25,7 +25,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="#">myzivi.ch <br />
-              <span class="nav-small">{% trans 'swiss civilian service search' %}</span></a>
+              <span class="nav-small">{% trans '(non-official) swiss civilian service search' %}</span></a>
           <div class="nav-collapse collapse">
             <ul class="nav">
               <!--<li class="active"><a href="#">Home</a></li>-->
diff --git a/zivimap/templates/index.html b/zivimap/templates/index.html
index 46b9cfe..15f0549 100644
--- a/zivimap/templates/index.html
+++ b/zivimap/templates/index.html
@@ -42,11 +42,7 @@
         <h4>{% trans 'Search options' %}</h4>
         <form id="search_form" action="{% url 'zivimap.views.index' %}" method="GET">
             {% include "search_form.html" with form=search_form %}
-            {% comment %}
-            <ul id="search_form">
-                {{ search_form.as_ul }}
-            </ul>
-            {% endcomment %}
+
             <input class="btn btn-primary" type="submit" value="{% trans 'Search' %}" />
         </form>
         <!-- Social buttons -->