diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 48a78bc..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Nexus_4_API_30.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-02-23T20:43:47.864894Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a01a67e..949e879 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -83,21 +83,13 @@
                     android:scheme="https"/>
             </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:host="maps.google.com"
-                    android:scheme="http"/>
-            </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:host="www.google.com"
+                    android:pathPrefix="/maps"
                     android:scheme="https"/>
             </intent-filter>
 
@@ -106,8 +98,8 @@
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
                 <data
-                    android:host="www.google.com"
-                    android:scheme="http"/>
+                    android:host="www.openstreetmap.org"
+                    android:scheme="https"/>
             </intent-filter>
 
         </activity>
diff --git a/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/detail/GeofavoriteDetailActivity.java b/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/detail/GeofavoriteDetailActivity.java
index 49f8996..0a6dfd8 100644
--- a/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/detail/GeofavoriteDetailActivity.java
+++ b/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/detail/GeofavoriteDetailActivity.java
@@ -27,6 +27,7 @@ import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Build;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Toast;
@@ -64,7 +65,6 @@ import it.danieleverducci.nextcloudmaps.utils.MapUtils;
 public class GeofavoriteDetailActivity extends NextcloudMapsStyledActivity implements LocationListener, ActivityCompat.OnRequestPermissionsResultCallback {
 
     public static final String TAG = "GeofavDetail";
-    public static final int MINIMUM_ACCEPTABLE_ACCURACY = 50;  // In meters
     public static final String ARG_GEOFAVORITE = "geofav";
     private static final int PERMISSION_REQUEST_CODE = 9999;
 
@@ -166,6 +166,7 @@ public class GeofavoriteDetailActivity extends NextcloudMapsStyledActivity imple
                     mGeofavorite.setLng(coords[1]);
                     mViewHolder.hideAccuracy();
                 } catch (IllegalArgumentException e) {
+                    Log.e(TAG, e.getMessage());
                     Toast.makeText(this, R.string.error_unsupported_uri, Toast.LENGTH_SHORT).show();
                     finish();
                 }
diff --git a/app/src/main/java/it/danieleverducci/nextcloudmaps/utils/GeoUriParser.java b/app/src/main/java/it/danieleverducci/nextcloudmaps/utils/GeoUriParser.java
index 8c74565..b6e6430 100644
--- a/app/src/main/java/it/danieleverducci/nextcloudmaps/utils/GeoUriParser.java
+++ b/app/src/main/java/it/danieleverducci/nextcloudmaps/utils/GeoUriParser.java
@@ -12,7 +12,7 @@ public class GeoUriParser {
     private static final Pattern PATTERN_GEO = Pattern.compile("geo:(-?[\\d.]+),(-?[\\d.]+)");
     // Try to match not only geoUri but also Google Maps Uri
     private static final Pattern PATTERN_BROAD = Pattern.compile(
-        "(?:&query=|&center=|geo:)(-?\\d{1,2}\\.\\d{1,10})(?:,|%2C)(-?\\d{1,3}\\.\\d{1,10})"
+        "(?:@|&query=|&center=|geo:|#map=\\d{1,2}\\/)(-?\\d{1,2}\\.\\d+)(?:,|%2C|\\/)(-?\\d{1,3}\\.\\d{1,10})"
     );
 
     /**
diff --git a/fastlane/metadata/android/en-US/changelogs/7.txt b/fastlane/metadata/android/en-US/changelogs/7.txt
index fde395f..6bcd175 100644
--- a/fastlane/metadata/android/en-US/changelogs/7.txt
+++ b/fastlane/metadata/android/en-US/changelogs/7.txt
@@ -1,4 +1,4 @@
 Fix crash when using corrupted dataset with null category (It may happen on imports from Google Maps)
 Reimplemented API Provider to try to fix NullPointerException on mApi reported in Play Store
 Open Google Maps on Google devices
-Support share from google maps and google maps urls
+Support share from: google maps urls, OpenStreetMap urls (only if containing coordinates)