diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
index eef6aa51b..b2bbef78f 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
@@ -201,3 +201,18 @@ browse.artifact.organization.name=Organization
 browse.artifact.organization.issueManagement=Issue Tracker
 browse.artifact.description=Description
 
+#search
+search.artifact.header=Search
+search.artifact.form.header=Search Query Parameters
+search.artifact.results.header=Search Results
+search.artifact.search.form.basic=Basic Parameters
+search.artifact.search.form.query.terms=Query Terms
+search.artifact.search.form.osgi=OSGI Parameters
+search.artifact.search.form.query.version=Version
+search.artifact.search.form.query.packaging=Packaging
+search.artifact.search.form.query.groupId=Group ID
+search.artifact.search.form.query.className=Class Name
+search.artifact.search.form.query.repositories=Repositories
+search.artifact.search.form.advanced=Advanced Parameters
+search.artifact.search.form.query.artifactId=Artifact ID
+
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
index 079ff1e54..55bdbc638 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
@@ -183,23 +183,23 @@
             <div class="pill-pane active" id="search-basic-form-pane">
               <form class="well form-inline" id="search-basic-form">
                 <fieldset>
-                    <div class="control-group" id="search-basic-repositories">
-                      <select data-placeholder="${$.i18n.prop('search.artifact.search.form.query.repositories')}"
-                              id="search-basic-repostories-select" class="chzn-select"
-                              multiple style="width:350px;" tabindex="4">
-                        <option value="">All</option>
-                        {{each(i,repoId) observableRepoIds}}
-                          <option value="${repoId}">${repoId}</option>
-                        {{/each}}
-                      </select>
-                  </div>
-                  <div class="control-group">
-                    <label class="control-label" for="search-terms"></label>
-                    <div class="controls">
-                      <input type="text" class="input-medium search-query" id="search-terms" name="search-terms" size="50"
-                             data-bind="value: searchParameters().basicQueryString" placeholder="${$.i18n.prop('search.artifact.search.form.query.terms')}"/>
-                    </div>
+                  <div class="control-group" id="search-basic-repositories">
+                    <select data-placeholder="${$.i18n.prop('search.artifact.search.form.query.repositories')}"
+                            id="search-basic-repostories-select" class="chzn-select"
+                            multiple style="width:350px;" tabindex="4">
+                      <option value="">All</option>
+                      {{each(i,repoId) observableRepoIds}}
+                        <option value="${repoId}">${repoId}</option>
+                      {{/each}}
+                    </select>
+                </div>
+                <div class="control-group">
+                  <label class="control-label" for="search-terms"></label>
+                  <div class="controls">
+                    <input type="text" class="input-medium search-query" id="search-terms" name="search-terms" size="50"
+                           data-bind="value: searchParameters().basicQueryString" placeholder="${$.i18n.prop('search.artifact.search.form.query.terms')}"/>
                   </div>
+                </div>
                 <button type="submit" class="btn" data-bind="click: basicSearch">Search</button>
               </form>
             </div>
@@ -254,7 +254,7 @@
 
 
       <div id="search-results" class="tab-pane">
-        results
+        No Results yet. Try a search !
       </div>
 
       </div>