diff --git a/htroot/index.html b/htroot/index.html
index ebd5e3890..044969d9f 100644
--- a/htroot/index.html
+++ b/htroot/index.html
@@ -56,7 +56,7 @@
     <form class="search form-inline" action="yacysearch.html" method="get" id="searchform" accept-charset="UTF-8">
       <fieldset class="maininput">
         <div class="input-group">
-          <input name="query" id="search" type="text" size="40" maxlength="80" value="#[former]#" onFocus="this.select()" class="form-control searchinput typeahead" />
+          <input name="query" id="search" type="text" size="40" maxlength="80" value="#[former]#" #(focus)#::autofocus="autofocus"#(/focus)# onFocus="this.select()" class="form-control searchinput typeahead" />
           <div class="input-group-btn">
             <button type="submit" id="Enter" class="btn btn-primary">Search</button>
           </div>
diff --git a/htroot/yacysearch.html b/htroot/yacysearch.html
index 4c78087a6..05d44be4c 100644
--- a/htroot/yacysearch.html
+++ b/htroot/yacysearch.html
@@ -92,7 +92,7 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
 <form class="search small" name="searchform" action="" method="get" accept-charset="UTF-8" style="position:fixed;top:8px;z-index:1052;max-width:500px;">
   
   <div class="input-group">
-    <input type="text" class="form-control searchinput typeahead" size="40" maxlength="200" placeholder="#[promoteSearchPageGreeting]#" name="query" value="#[former]#" onFocus="this.select()" id="search" onclick="document.getElementById('Enter').innerHTML = 'search'"/>
+    <input type="text" class="form-control searchinput typeahead" size="40" maxlength="200" placeholder="#[promoteSearchPageGreeting]#" name="query" value="#[former]#" autofocus="autofocus" onFocus="this.select()" id="search" onclick="document.getElementById('Enter').innerHTML = 'search'"/>
     <div class="input-group-btn">
        <button id="Enter" class="btn btn-default" type="submit">search</button>
     </div>
diff --git a/htroot/yacysearch_location.html b/htroot/yacysearch_location.html
index 72122e4be..a9894262f 100644
--- a/htroot/yacysearch_location.html
+++ b/htroot/yacysearch_location.html
@@ -172,7 +172,7 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
   <h2>#[promoteSearchPageGreeting]#</h2>
   <div class="yacylogo"><a href="#[promoteSearchPageGreeting.homepage]#" class="yacylogo"><img src="#[promoteSearchPageGreeting.smallImage]#" alt="yacysearch" /></a></div>
   <fieldset class="yacys">
-     <input type="text" value="#(initsearch)#::#[query]##(/initsearch)#" id="query" size="42" onFocus="this.select()" />
+     <input type="text" value="#(initsearch)#::#[query]##(/initsearch)#" id="query" size="42" autofocus="autofocus" onFocus="this.select()" />
      <input type="submit" onclick="search(); return false;" value="search" onsubmit="search(); return false;" />
   </fieldset>
   <div id="resultline"></div>
diff --git a/htroot/yacysearchtrailer.html b/htroot/yacysearchtrailer.html
index 6fcbdc2f0..c27c075e6 100644
--- a/htroot/yacysearchtrailer.html
+++ b/htroot/yacysearchtrailer.html
@@ -30,7 +30,7 @@
   data-content="You can switch to 'Peer-to-Peer Mode' which will cause that your search is done using the other peers in the YaCy network."
   >
 <input
-  data-label-text="Privacy"
+  data-label-text="Peer-to-Peer"
   data-on-text="<span>&nbsp;&nbsp;&nbsp;Peer-to-Peer&nbsp;&nbsp;&nbsp;&nbsp;</span>"
   data-off-text="<span>&nbsp;&nbsp;&nbsp;&nbsp;Stealth&nbsp;Mode&nbsp;&nbsp;&nbsp;</span>"
   data-on-color="warning" data-off-color="success"