diff --git a/lib/src/main/AndroidManifest.xml b/lib/src/main/AndroidManifest.xml
index 15414f2..62fcb7f 100644
--- a/lib/src/main/AndroidManifest.xml
+++ b/lib/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <queries>
+    <!-- packages we want to see using the package manager need to be declared starting with targetSDK 30, and we need to use specific strings / cannot use @string/xxx notation -->
     <package android:name="app.organicmaps"/>
     <package android:name="com.mapswithme.maps"/>
   </queries>
diff --git a/lib/src/main/java/app/organicmaps/api/OrganicMapsApi.java b/lib/src/main/java/app/organicmaps/api/OrganicMapsApi.java
index 5ea2439..3cbd375 100644
--- a/lib/src/main/java/app/organicmaps/api/OrganicMapsApi.java
+++ b/lib/src/main/java/app/organicmaps/api/OrganicMapsApi.java
@@ -1,16 +1,14 @@
 package app.organicmaps.api;
 
 import android.app.Activity;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ActivityInfo;
 
 import java.util.ArrayList;
 
 public class OrganicMapsApi {
 
-    static final String PACKAGE_NAME = "app.organicmaps";
-
     private OrganicMapsApi() {
         // utility class
     }
@@ -31,9 +29,6 @@ public class OrganicMapsApi {
 
     public static void sendRequest(final Activity caller, final Intent intent) {
         if (isOrganicMapsInstalled(caller)) {
-            // Match activity for intent
-            final ActivityInfo aInfo = caller.getPackageManager().resolveActivity(intent, 0).activityInfo;
-            intent.setClassName(aInfo.packageName, aInfo.name);
             caller.startActivity(intent);
         } else {
             new DownloadDialog(caller).show();
@@ -44,8 +39,8 @@ public class OrganicMapsApi {
      * Detects if any version of OrganicMaps is installed on the device
      */
     public static boolean isOrganicMapsInstalled(final Context context) {
-        final Intent i = context.getPackageManager().getLaunchIntentForPackage(PACKAGE_NAME);
-        return i != null;
+        final ComponentName c = new MapRequest().toIntent().resolveActivity(context.getPackageManager());
+        return c != null;
     }
 
 }