diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index caa3771824..d2a12766f2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -65,167 +65,156 @@
 
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="https" />
-                <data android:host="planet.learning.ole.org" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="https"
+                    android:host="planet.learning.ole.org"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="http" />
-                <data android:host="planet.learning.ole.org" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="http"
+                    android:host="planet.learning.ole.org"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="https" />
-                <data android:host="planet.guatemala.ole.org" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="https"
+                    android:host="planet.guatemala.ole.org"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="http" />
-                <data android:host="planet.guatemala.ole.org" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="http"
+                    android:host="planet.guatemala.ole.org"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="https" />
-                <data android:host="planet.embakasi.ole.org" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="https"
+                    android:host="planet.embakasi.ole.org"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="http" />
-                <data android:host="planet.embakasi.ole.org" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="http"
+                    android:host="planet.embakasi.ole.org"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
-            <intent-filter android:autoVerify="true">
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="http" />
-                <data
+                <data android:scheme="myapp"
                     android:host="tunnel.ole.org"
-                    android:port="54380" />
-                <data android:pathPattern="/eng/login" />
+                    android:port="54380"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
-            <intent-filter android:autoVerify="true">
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="https" />
-                <data
+                <data android:scheme="https"
                     android:host="tunnel.ole.org"
-                    android:port="54380" />
-                <data android:pathPattern="/eng/login" />
+                    android:port="54380"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="https" />
-                <data android:host="planet.uriur.ole.org" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="https"
+                    android:host="planet.uriur.ole.org"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="http" />
-                <data android:host="planet.uriur.ole.org" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="http"
+                    android:host="planet.uriur.ole.org"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="http" />
-                <data android:host="planet.ruiru.ole.org" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="http"
+                    android:host="planet.ruiru.ole.org"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="https" />
-                <data android:host="planet.ruiru.ole.org" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="https"
+                    android:host="planet.ruiru.ole.org"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
-            <intent-filter android:autoVerify="true">
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="http" />
-                <data android:host="192.168.100.27" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="myapp"
+                    android:host="192.168.100.27"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
-            <intent-filter android:autoVerify="true">
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="http" />
-                <data android:host="192.168.100.178" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="myapp"
+                    android:host="192.168.100.178"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="http" />
-                <data android:host="192.168.68.126" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="http"
+                    android:host="192.168.68.126"
+                    android:pathPrefix="/eng/login" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="myapp"
+                    android:host="192.168.88.10"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="https" />
-                <data android:host="planet.egdirbmac.ole.org" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="https"
+                    android:host="planet.egdirbmac.ole.org"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
         </activity>
         <activity
diff --git a/app/src/main/AndroidManifest.xml.lite b/app/src/main/AndroidManifest.xml.lite
index db76eca996..288a5a7bb1 100644
--- a/app/src/main/AndroidManifest.xml.lite
+++ b/app/src/main/AndroidManifest.xml.lite
@@ -65,167 +65,156 @@
 
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="https" />
-                <data android:host="planet.learning.ole.org" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="https"
+                    android:host="planet.learning.ole.org"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="http" />
-                <data android:host="planet.learning.ole.org" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="http"
+                    android:host="planet.learning.ole.org"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="https" />
-                <data android:host="planet.guatemala.ole.org" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="https"
+                    android:host="planet.guatemala.ole.org"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="http" />
-                <data android:host="planet.guatemala.ole.org" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="http"
+                    android:host="planet.guatemala.ole.org"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="https" />
-                <data android:host="planet.embakasi.ole.org" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="https"
+                    android:host="planet.embakasi.ole.org"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="http" />
-                <data android:host="planet.embakasi.ole.org" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="http"
+                    android:host="planet.embakasi.ole.org"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
-            <intent-filter android:autoVerify="true">
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="http" />
-                <data
+                <data android:scheme="myapp"
                     android:host="tunnel.ole.org"
-                    android:port="54380" />
-                <data android:pathPattern="/eng/login" />
+                    android:port="54380"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
-            <intent-filter android:autoVerify="true">
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="https" />
-                <data
+                <data android:scheme="https"
                     android:host="tunnel.ole.org"
-                    android:port="54380" />
-                <data android:pathPattern="/eng/login" />
+                    android:port="54380"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="https" />
-                <data android:host="planet.uriur.ole.org" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="https"
+                    android:host="planet.uriur.ole.org"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="http" />
-                <data android:host="planet.uriur.ole.org" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="http"
+                    android:host="planet.uriur.ole.org"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="http" />
-                <data android:host="planet.ruiru.ole.org" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="http"
+                    android:host="planet.ruiru.ole.org"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="https" />
-                <data android:host="planet.ruiru.ole.org" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="https"
+                    android:host="planet.ruiru.ole.org"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
-            <intent-filter android:autoVerify="true">
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="http" />
-                <data android:host="192.168.100.27" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="myapp"
+                    android:host="192.168.100.27"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
-            <intent-filter android:autoVerify="true">
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="http" />
-                <data android:host="192.168.100.178" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="myapp"
+                    android:host="192.168.100.178"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="http" />
-                <data android:host="192.168.68.126" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="http"
+                    android:host="192.168.68.126"
+                    android:pathPrefix="/eng/login" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="myapp"
+                    android:host="192.168.88.10"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="https" />
-                <data android:host="planet.egdirbmac.ole.org" />
-                <data android:pathPattern="/eng/login" />
+                <data android:scheme="https"
+                    android:host="planet.egdirbmac.ole.org"
+                    android:pathPrefix="/eng/login" />
             </intent-filter>
         </activity>
         <activity