diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8a7dea44..ef469e26 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,12 +27,16 @@
 
             <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"
-                    android:host="*twitter.com" />
+                    android:host="twitter.com" />
+                <data
+                    android:scheme="https"
+                    android:host="mobile.twitter.com" />
             </intent-filter>
 
         </activity>
diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/LinkContentLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/LinkContentLoader.java
index 0868a9a5..1fd945a7 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/LinkContentLoader.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/LinkContentLoader.java
@@ -49,7 +49,7 @@ public class LinkContentLoader extends AsyncTask<Uri, Void, LinkContentLoader.Da
             String path = link.getPath();
             if (path != null && path.length() > 1) {
                 path = path.substring(1);
-                if (path.startsWith("search")) {
+                if (path.startsWith("search") && link.isHierarchical()) {
                     String search = link.getQueryParameter("q");
                     if (search != null) {
                         data.putString(KEY_SEARCH_QUERY, search);