diff --git a/README.md b/README.md
index 1ac6b49..57b84f7 100644
--- a/README.md
+++ b/README.md
@@ -3,19 +3,19 @@
 [![Integration level](https://dash.yunohost.org/integration/wikijs.svg)](https://dash.yunohost.org/appci/app/wikijs)  
 [![Install wikijs with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=wikijs)
 
-> *This package allow you to install wikijs quickly and simply on a YunoHost server.  
-If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
+> *This package allows you to install wikijs easily and quickly on a YunoHost server.  
+If you don't have YunoHost, please look at [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Overview
-An open source, modern and powerful wiki app built on Node.js, Git and Markdown for YunoHost.
+A copylefted libre software, modern and powerful wiki app built on Node.js, Git and Markdown for YunoHost.
 
 **Shipped version:** 2.0.12
 
-## Important points to read before installing
+## Important points before installing
 
-**Wiki.js is still under development, all features not already implemented.**
+**Wiki.js is still under development, not all features are implemented yet.**
 
-**Wiki.js** require a dedicated **root domain**, eg. wikijs.domain.tld
+**Wiki.js** requires a dedicated **root domain**, e.g. wikijs.domain.tld
 
 ## Screenshots
 
@@ -33,15 +33,15 @@ An open source, modern and powerful wiki app built on Node.js, Git and Markdown
 
 ## YunoHost specific features
 
-#### Multi-users support
+#### Multi-user support
 
-LDAP is implemented, root will receive a mail at the end of the installation or the upgrade with the informations to configure LDAP. 
-No HTTP auth for now but planned to be supported. 
-The app can be used by multiple users 
+LDAP is implemented, root will receive an e-mail at the end of the installation or the upgrade with the info on how to configure LDAP.
+No HTTP auth for now, but planned for the future.
+The app can be used by multiple users.
 
 #### Supported architectures
 
-* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/wikijs%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/wikijs/)
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/wikijs%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/wikijs/)
 * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/wikijs%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/wikijs/)
 
 ## Limitations
@@ -60,7 +60,7 @@ The app can be used by multiple users
 Developers info
 ----------------
 
-Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/wikijs_ynh/tree/testing).
+Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/wikijs_ynh/tree/testing).
 
 To try the testing branch, please proceed like that.
 ```
diff --git a/manifest.json b/manifest.json
index 3ff1298..f150e1f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "An open source, modern and powerful wiki app built on Node.js, Git and Markdown.",
         "fr": "Un wiki moderne et open source propulsé Node.js, Git et Markdown."
     },
-    "version": "2.0.12~ynh1",
+    "version": "2.0.12~ynh2",
     "url": "https://wiki.js.org/",
     "license": "AGPL-3.0-or-later",
     "maintainer": {
diff --git a/scripts/install b/scripts/install
index b91af54..c8c5765 100644
--- a/scripts/install
+++ b/scripts/install
@@ -87,6 +87,7 @@ ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 ynh_app_setting_set --app=$app --key=db_pwd --value=$db_pwd
 ynh_psql_test_if_first_run
 ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
+ynh_psql_execute_as_root --sql="CREATE EXTENSION IF NOT EXISTS pg_trgm;" --database=$db_name
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
diff --git a/scripts/restore b/scripts/restore
index 54ab6d5..83ce0db 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -95,6 +95,7 @@ ynh_print_info --message="Restoring the PostgreSQL database..."
 
 ynh_psql_test_if_first_run
 ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
+ynh_psql_execute_as_root --sql="CREATE EXTENSION IF NOT EXISTS pg_trgm;" --database=$db_name
 ynh_psql_execute_file_as_root --file="./db.sql" --database="$db_name"
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index e39d226..47d5665 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -79,6 +79,10 @@ ynh_secure_remove --file="/var/log/$app/"
 # Create PostgreSQL User
 ynh_psql_create_user $db_name $db_pwd
 
+# Install pg_trgm extension to provide a PostgreSQL search solution
+ynh_psql_test_if_first_run
+ynh_psql_execute_as_root --sql="CREATE EXTENSION IF NOT EXISTS pg_trgm;" --database=$db_name
+
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================