diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d85b34bdab..174f160bf3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -39,6 +39,7 @@
         <action android:name="android.intent.action.VIEW" />
 
         <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
 
         <data android:scheme="content" />
         <data android:mimeType="application/octet-stream" />
@@ -52,10 +53,10 @@
 
         <data android:scheme="file" />
         <data android:mimeType="*/*" />
-        <data android:pathPattern=".*\\.zim" />
-        <data android:pathPattern=".*\\..*\\.zim" />
-        <data android:pathPattern=".*\\..*\\..*\\.zim" />
-        <data android:pathPattern=".*\\..*\\..*\\..*\\.zim" />
+        <data android:pathPattern="/.*\\.zim" />
+        <data android:pathPattern="/.*\\..*\\.zim" />
+        <data android:pathPattern="/.*\\..*\\..*\\.zim" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\.zim" />
         <data android:host="*" />
       </intent-filter>
       <intent-filter>
@@ -66,13 +67,13 @@
 
         <data android:scheme="file" />
         <data android:mimeType="*/*" />
-        <data android:pathPattern=".*\\.zimaa" />
-        <data android:pathPattern=".*\\..*\\.zimaa" />
-        <data android:pathPattern=".*\\..*\\..*\\.zimaa" />
-        <data android:pathPattern=".*\\..*\\..*\\..*\\.zimaa" />
+        <data android:pathPattern="/.*\\.zimaa" />
+        <data android:pathPattern="/.*\\..*\\.zimaa" />
+        <data android:pathPattern="/.*\\..*\\..*\\.zimaa" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\.zimaa" />
         <data android:host="*" />
       </intent-filter>
-      <intent-filter>
+      <intent-filter android:autoVerify="true">
         <action android:name="android.intent.action.VIEW" />
 
         <category android:name="android.intent.category.DEFAULT" />
@@ -80,12 +81,12 @@
 
         <data android:scheme="http" />
         <data android:host="*" />
-        <data android:pathPattern=".*\\.zim(aa|)" />
-        <data android:pathPattern=".*\\..*\\.zim(aa|)" />
-        <data android:pathPattern=".*\\..*\\..*\\.zim(aa|)" />
-        <data android:pathPattern=".*\\..*\\..*\\..*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\..*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\..*\\..*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\.zim(aa|)" />
       </intent-filter>
-      <intent-filter>
+      <intent-filter android:autoVerify="true">
         <action android:name="android.intent.action.VIEW" />
 
         <category android:name="android.intent.category.DEFAULT" />
@@ -93,10 +94,10 @@
 
         <data android:scheme="https" />
         <data android:host="*" />
-        <data android:pathPattern=".*\\.zim(aa|)" />
-        <data android:pathPattern=".*\\..*\\.zim(aa|)" />
-        <data android:pathPattern=".*\\..*\\..*\\.zim(aa|)" />
-        <data android:pathPattern=".*\\..*\\..*\\..*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\..*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\..*\\..*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\.zim(aa|)" />
       </intent-filter>
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />
@@ -106,10 +107,10 @@
 
         <data android:scheme="content" />
         <data android:host="*" />
-        <data android:pathPattern=".*\\.zim(aa|)" />
-        <data android:pathPattern=".*\\..*\\.zim(aa|)" />
-        <data android:pathPattern=".*\\..*\\..*\\.zim(aa|)" />
-        <data android:pathPattern=".*\\..*\\..*\\..*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\..*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\..*\\..*\\.zim(aa|)" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\.zim(aa|)" />
       </intent-filter>
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />
diff --git a/lintConfig.xml b/lintConfig.xml
index 3266191e3e..62aaad8d0b 100644
--- a/lintConfig.xml
+++ b/lintConfig.xml
@@ -47,4 +47,5 @@
   <issue id="UnusedIds" severity="warning" />
   <issue id="DataExtractionRules" severity="warning" />
   <issue id="ObsoleteSdkInt" severity="warning" />
+  <issue id="AppLinksAutoVerify" severity="warning" />
 </lint>