diff --git a/client/src/components/Header.vue b/client/src/components/Header.vue
index 15aca93..6dda444 100644
--- a/client/src/components/Header.vue
+++ b/client/src/components/Header.vue
@@ -5,7 +5,7 @@
 
       <h1>{{indexName}}</h1>
 
-      <h4 v-translate>A video index developed by <a href="https://framasoft.org" target="_blank">Framasoft</a></h4>
+      <h4 v-translate>A search engine of <a href="https://joinpeertube.org" target="_blank">PeerTube</a> videos and channels, developed by <a href="https://framasoft.org" target="_blank">Framasoft</a></h4>
 
       <img class="search-home" src="/img/search-home.png" alt="">
     </header>
@@ -32,11 +32,14 @@
 
     .search-home {
       width: 300px;
+      height: 250px;
       margin: 30px 0 0 0;
     }
 
     h1 {
       font-size: 50px;
+      // Because it's loaded dynamically
+      min-height: 70px;
       margin: 0;
       text-align: center;
     }
diff --git a/client/src/views/Search.vue b/client/src/views/Search.vue
index 1ba15aa..c292f99 100644
--- a/client/src/views/Search.vue
+++ b/client/src/views/Search.vue
@@ -30,7 +30,8 @@
           <div class="button-rows">
             <button class="filters-button peertube-button" v-on:click="toggleFilters()">
               <translate>Filters</translate>
-              <span v-if="activeFilters" v-translate="{ activeFilters: activeFilters }"> (%{activeFilters} active)</span>
+              &nbsp;
+              <span v-if="activeFilters">({{ activeFilters }})</span>
 
               <div class="arrow-down"></div>
             </button>
@@ -165,16 +166,28 @@
         </div>
 
         <div id="results-anchor" class="results-summary" v-if="(searchedTerm && resultsCount === 0) || (resultsCount !== null && resultsCount !== 0)">
-          <span v-if="searchedTerm && resultsCount === 0" v-translate>No results found for</span>&nbsp;
-          <span v-if="resultsCount !== null && resultsCount !== 0" v-translate="{ resultsCount: resultsCount }">%{resultsCount} results found for</span>&nbsp;
+          <span v-if="searchedTerm && resultsCount === 0" v-translate>No results found for</span>
+
+          &nbsp;
+
+          <span v-if="resultsCount !== null && resultsCount !== 0">
+            <translate :translate-n="resultsCount" translate-plural="%{resultsCount} results found for">%{resultsCount} result found for</translate>
+          </span>
+
+          &nbsp;
+
           <strong>
             {{ searchedTerm }}
-            <span v-if="activeFilters > 0" v-translate="{ activeFilters: activeFilters }">with %{activeFilters} active filters</span>
+            <span v-if="activeFilters > 0">
+              <translate :translate-n="activeFilters" translate-plural="with %{activeFilters} active filters">with %{activeFilters} active filter</translate>
+            </span>
           </strong>
 
           &nbsp;
 
-          <span v-translate="{ instancesCount: instancesCount }">on %{instancesCount} indexed PeerTube websites</span>
+          <span>
+            <translate :translate-n="instancesCount" translate-plural="on %{instancesCount} indexed PeerTube websites">on %{instancesCount} indexed PeerTube website</translate>
+          </span>
         </div>
 
         <div v-for="result in results" :key="getResultKey(result)">
@@ -619,7 +632,7 @@
       },
 
       homeTitleMessage () {
-        return this.$gettextInterpolate(this.$gettext('Display the video index homepage'))
+        return this.$gettext('Display homepage')
       }
     },
 
diff --git a/config/default.yaml b/config/default.yaml
index 1d7b131..088b739 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -19,7 +19,7 @@ log:
 
 search-instance:
   name: 'PeerTube Search Index'
-  description: 'Search for your favorite PeerTube videos and channels!'
+  description: 'A search engine of PeerTube videos and channels, developed by Framasoft'
   legal_notices_url: ''
 
 instances-index: