diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index f5e58e5cdc..02fcccc1f9 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -182,7 +182,6 @@
 			<intent-filter>
 				<data android:scheme="http" />
 				<data android:scheme="https" />
-				<data android:host="maps.google.com" />
 				<data android:host="maps.yandex.ru" />
 				<data android:host="maps.yandex.com" />
 				<data android:host="www.openstreetmap.org" />
@@ -202,13 +201,6 @@
 				<category android:name="android.intent.category.DEFAULT" />
 				<category android:name="android.intent.category.BROWSABLE" />
 			</intent-filter>
-			<intent-filter>
-				<data android:scheme="http" android:host="www.google.com" android:pathPrefix="/maps" />
-				<data android:scheme="https" android:host="www.google.com" android:pathPrefix="/maps" />
-				<action android:name="android.intent.action.VIEW" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<category android:name="android.intent.category.BROWSABLE" />
-			</intent-filter>
 			<intent-filter>
 				<data android:scheme="http" android:host="openstreetmap.de" android:pathPrefix="/karte" />
 				<data android:scheme="https" android:host="openstreetmap.de" android:pathPrefix="/karte" />
@@ -235,6 +227,436 @@
 				<data android:mimeType="vnd.android.cursor.item/postal-address_v2" />
 			</intent-filter>
 			-->
+			<!-- generated from https://en.wikipedia.org/wiki/List_of_Google_domains -->
+			<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:scheme="https" />
+				<data android:host="maps.google.ac" />
+				<data android:host="maps.google.ad" />
+				<data android:host="maps.google.ae" />
+				<data android:host="maps.google.al" />
+				<data android:host="maps.google.am" />
+				<data android:host="maps.google.as" />
+				<data android:host="maps.google.at" />
+				<data android:host="maps.google.az" />
+				<data android:host="maps.google.ba" />
+				<data android:host="maps.google.be" />
+				<data android:host="maps.google.bf" />
+				<data android:host="maps.google.bg" />
+				<data android:host="maps.google.bi" />
+				<data android:host="maps.google.bj" />
+				<data android:host="maps.google.bs" />
+				<data android:host="maps.google.bt" />
+				<data android:host="maps.google.by" />
+				<data android:host="maps.google.ca" />
+				<data android:host="maps.google.cat" />
+				<data android:host="maps.google.cc" />
+				<data android:host="maps.google.cd" />
+				<data android:host="maps.google.cf" />
+				<data android:host="maps.google.cg" />
+				<data android:host="maps.google.ch" />
+				<data android:host="maps.google.ci" />
+				<data android:host="maps.google.cl" />
+				<data android:host="maps.google.cm" />
+				<data android:host="maps.google.cn" />
+				<data android:host="maps.google.co.ao" />
+				<data android:host="maps.google.co.bw" />
+				<data android:host="maps.google.co.ck" />
+				<data android:host="maps.google.co.cr" />
+				<data android:host="maps.googlecode.com" />
+				<data android:host="maps.google.co.id" />
+				<data android:host="maps.google.co.il" />
+				<data android:host="maps.google.co.in" />
+				<data android:host="maps.google.co.jp" />
+				<data android:host="maps.google.co.ke" />
+				<data android:host="maps.google.co.kr" />
+				<data android:host="maps.google.co.ls" />
+				<data android:host="maps.google.com" />
+				<data android:host="maps.google.co.ma" />
+				<data android:host="maps.google.com.af" />
+				<data android:host="maps.google.com.ag" />
+				<data android:host="maps.google.com.ai" />
+				<data android:host="maps.google.com.ar" />
+				<data android:host="maps.google.com.au" />
+				<data android:host="maps.google.com.bd" />
+				<data android:host="maps.google.com.bh" />
+				<data android:host="maps.google.com.bn" />
+				<data android:host="maps.google.com.bo" />
+				<data android:host="maps.google.com.br" />
+				<data android:host="maps.google.com.bz" />
+				<data android:host="maps.google.com.co" />
+				<data android:host="maps.google.com.cu" />
+				<data android:host="maps.google.com.cy" />
+				<data android:host="maps.google.com.do" />
+				<data android:host="maps.google.com.ec" />
+				<data android:host="maps.google.com.eg" />
+				<data android:host="maps.google.com.et" />
+				<data android:host="maps.google.com.fj" />
+				<data android:host="maps.google.com.gh" />
+				<data android:host="maps.google.com.gi" />
+				<data android:host="maps.google.com.gt" />
+				<data android:host="maps.google.com.hk" />
+				<data android:host="maps.google.com.jm" />
+				<data android:host="maps.google.com.kh" />
+				<data android:host="maps.google.com.kw" />
+				<data android:host="maps.google.com.lb" />
+				<data android:host="maps.google.com.lc" />
+				<data android:host="maps.google.com.ly" />
+				<data android:host="maps.google.com.mm" />
+				<data android:host="maps.google.com.mt" />
+				<data android:host="maps.google.com.mx" />
+				<data android:host="maps.google.com.my" />
+				<data android:host="maps.google.com.na" />
+				<data android:host="maps.google.com.nf" />
+				<data android:host="maps.google.com.ng" />
+				<data android:host="maps.google.com.ni" />
+				<data android:host="maps.google.com.np" />
+				<data android:host="maps.google.com.om" />
+				<data android:host="maps.google.com.pa" />
+				<data android:host="maps.google.com.pe" />
+				<data android:host="maps.google.com.pg" />
+				<data android:host="maps.google.com.ph" />
+				<data android:host="maps.google.com.pk" />
+				<data android:host="maps.google.com.pr" />
+				<data android:host="maps.google.com.py" />
+				<data android:host="maps.google.com.qa" />
+				<data android:host="maps.google.com.sa" />
+				<data android:host="maps.google.com.sb" />
+				<data android:host="maps.google.com.sg" />
+				<data android:host="maps.google.com.sl" />
+				<data android:host="maps.google.com.sv" />
+				<data android:host="maps.google.com.tj" />
+				<data android:host="maps.google.com.tn" />
+				<data android:host="maps.google.com.tr" />
+				<data android:host="maps.google.com.tw" />
+				<data android:host="maps.google.com.ua" />
+				<data android:host="maps.google.com.uy" />
+				<data android:host="maps.google.com.vc" />
+				<data android:host="maps.google.com.vn" />
+				<data android:host="maps.google.co.mz" />
+				<data android:host="maps.google.co.nz" />
+				<data android:host="maps.google.co.th" />
+				<data android:host="maps.google.co.tz" />
+				<data android:host="maps.google.co.ug" />
+				<data android:host="maps.google.co.uk" />
+				<data android:host="maps.google.co.uz" />
+				<data android:host="maps.google.co.ve" />
+				<data android:host="maps.google.co.vi" />
+				<data android:host="maps.google.co.za" />
+				<data android:host="maps.google.co.zm" />
+				<data android:host="maps.google.co.zw" />
+				<data android:host="maps.google.cv" />
+				<data android:host="maps.google.cz" />
+				<data android:host="maps.google.de" />
+				<data android:host="maps.google.dj" />
+				<data android:host="maps.google.dk" />
+				<data android:host="maps.google.dm" />
+				<data android:host="maps.google.dz" />
+				<data android:host="maps.googlee.com" />
+				<data android:host="maps.google.ee" />
+				<data android:host="maps.google.es" />
+				<data android:host="maps.google.fi" />
+				<data android:host="maps.google.fm" />
+				<data android:host="maps.google.fr" />
+				<data android:host="maps.google.ga" />
+				<data android:host="maps.google.ge" />
+				<data android:host="maps.google.gf" />
+				<data android:host="maps.google.gg" />
+				<data android:host="maps.google.gl" />
+				<data android:host="maps.google.gm" />
+				<data android:host="maps.google.gp" />
+				<data android:host="maps.google.gr" />
+				<data android:host="maps.google.gy" />
+				<data android:host="maps.google.hn" />
+				<data android:host="maps.google.hr" />
+				<data android:host="maps.google.ht" />
+				<data android:host="maps.google.hu" />
+				<data android:host="maps.google.ie" />
+				<data android:host="maps.google.im" />
+				<data android:host="maps.google.io" />
+				<data android:host="maps.google.iq" />
+				<data android:host="maps.google.ir" />
+				<data android:host="maps.google.is" />
+				<data android:host="maps.google.it" />
+				<data android:host="maps.google.je" />
+				<data android:host="maps.google.jo" />
+				<data android:host="maps.google.kg" />
+				<data android:host="maps.google.ki" />
+				<data android:host="maps.google.kz" />
+				<data android:host="maps.google.la" />
+				<data android:host="maps.google.li" />
+				<data android:host="maps.google.lk" />
+				<data android:host="maps.google.lt" />
+				<data android:host="maps.google.lu" />
+				<data android:host="maps.google.lv" />
+				<data android:host="maps.google.md" />
+				<data android:host="maps.google.me" />
+				<data android:host="maps.google.mg" />
+				<data android:host="maps.google.mk" />
+				<data android:host="maps.google.ml" />
+				<data android:host="maps.google.mn" />
+				<data android:host="maps.google.ms" />
+				<data android:host="maps.google.mu" />
+				<data android:host="maps.google.mv" />
+				<data android:host="maps.google.mw" />
+				<data android:host="maps.google.ne" />
+				<data android:host="maps.google.net" />
+				<data android:host="maps.google.nl" />
+				<data android:host="maps.google.no" />
+				<data android:host="maps.google.nr" />
+				<data android:host="maps.google.nu" />
+				<data android:host="maps.google.org" />
+				<data android:host="maps.google.pl" />
+				<data android:host="maps.google.pn" />
+				<data android:host="maps.google.ps" />
+				<data android:host="maps.google.pt" />
+				<data android:host="maps.google.ro" />
+				<data android:host="maps.google.rs" />
+				<data android:host="maps.google.ru" />
+				<data android:host="maps.google.rw" />
+				<data android:host="maps.google.sc" />
+				<data android:host="maps.google.se" />
+				<data android:host="maps.google.sh" />
+				<data android:host="maps.google.si" />
+				<data android:host="maps.google.sk" />
+				<data android:host="maps.google.sm" />
+				<data android:host="maps.google.sn" />
+				<data android:host="maps.google.so" />
+				<data android:host="maps.google.st" />
+				<data android:host="maps.google.td" />
+				<data android:host="maps.google.tg" />
+				<data android:host="maps.google.tk" />
+				<data android:host="maps.google.tl" />
+				<data android:host="maps.google.tm" />
+				<data android:host="maps.google.tn" />
+				<data android:host="maps.google.to" />
+				<data android:host="maps.google.tt" />
+				<data android:host="maps.google.us" />
+				<data android:host="maps.google.vg" />
+				<data android:host="maps.google.vu" />
+				<data android:host="maps.google.ws" />
+				<data android:host="www.googlemaps.com" />
+			</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="http" />
+				<data android:scheme="https" />
+
+				<data android:pathPrefix="/maps" />
+
+				<data android:host="www.google.ac" />
+				<data android:host="www.google.ad" />
+				<data android:host="www.google.ae" />
+				<data android:host="www.google.al" />
+				<data android:host="www.google.am" />
+				<data android:host="www.google.as" />
+				<data android:host="www.google.at" />
+				<data android:host="www.google.az" />
+				<data android:host="www.google.ba" />
+				<data android:host="www.google.be" />
+				<data android:host="www.google.bf" />
+				<data android:host="www.google.bg" />
+				<data android:host="www.google.bi" />
+				<data android:host="www.google.bj" />
+				<data android:host="www.google.bs" />
+				<data android:host="www.google.bt" />
+				<data android:host="www.google.by" />
+				<data android:host="www.google.ca" />
+				<data android:host="www.google.cat" />
+				<data android:host="www.google.cc" />
+				<data android:host="www.google.cd" />
+				<data android:host="www.google.cf" />
+				<data android:host="www.google.cg" />
+				<data android:host="www.google.ch" />
+				<data android:host="www.google.ci" />
+				<data android:host="www.google.cl" />
+				<data android:host="www.google.cm" />
+				<data android:host="www.google.cn" />
+				<data android:host="www.google.co.ao" />
+				<data android:host="www.google.co.bw" />
+				<data android:host="www.google.co.ck" />
+				<data android:host="www.google.co.cr" />
+				<data android:host="www.google.co.id" />
+				<data android:host="www.google.co.il" />
+				<data android:host="www.google.co.in" />
+				<data android:host="www.google.co.jp" />
+				<data android:host="www.google.co.ke" />
+				<data android:host="www.google.co.kr" />
+				<data android:host="www.google.co.ls" />
+				<data android:host="www.google.com" />
+				<data android:host="www.google.co.ma" />
+				<data android:host="www.google.com.af" />
+				<data android:host="www.google.com.ag" />
+				<data android:host="www.google.com.ai" />
+				<data android:host="www.google.com.ar" />
+				<data android:host="www.google.com.au" />
+				<data android:host="www.google.com.bd" />
+				<data android:host="www.google.com.bh" />
+				<data android:host="www.google.com.bn" />
+				<data android:host="www.google.com.bo" />
+				<data android:host="www.google.com.br" />
+				<data android:host="www.google.com.bz" />
+				<data android:host="www.google.com.co" />
+				<data android:host="www.google.com.cu" />
+				<data android:host="www.google.com.cy" />
+				<data android:host="www.google.com.do" />
+				<data android:host="www.google.com.ec" />
+				<data android:host="www.google.com.eg" />
+				<data android:host="www.google.com.et" />
+				<data android:host="www.google.com.fj" />
+				<data android:host="www.google.com.gh" />
+				<data android:host="www.google.com.gi" />
+				<data android:host="www.google.com.gt" />
+				<data android:host="www.google.com.hk" />
+				<data android:host="www.google.com.jm" />
+				<data android:host="www.google.com.kh" />
+				<data android:host="www.google.com.kw" />
+				<data android:host="www.google.com.lb" />
+				<data android:host="www.google.com.lc" />
+				<data android:host="www.google.com.ly" />
+				<data android:host="www.google.com.mm" />
+				<data android:host="www.google.com.mt" />
+				<data android:host="www.google.com.mx" />
+				<data android:host="www.google.com.my" />
+				<data android:host="www.google.com.na" />
+				<data android:host="www.google.com.nf" />
+				<data android:host="www.google.com.ng" />
+				<data android:host="www.google.com.ni" />
+				<data android:host="www.google.com.np" />
+				<data android:host="www.google.com.om" />
+				<data android:host="www.google.com.pa" />
+				<data android:host="www.google.com.pe" />
+				<data android:host="www.google.com.pg" />
+				<data android:host="www.google.com.ph" />
+				<data android:host="www.google.com.pk" />
+				<data android:host="www.google.com.pr" />
+				<data android:host="www.google.com.py" />
+				<data android:host="www.google.com.qa" />
+				<data android:host="www.google.com.sa" />
+				<data android:host="www.google.com.sb" />
+				<data android:host="www.google.com.sg" />
+				<data android:host="www.google.com.sl" />
+				<data android:host="www.google.com.sv" />
+				<data android:host="www.google.com.tj" />
+				<data android:host="www.google.com.tn" />
+				<data android:host="www.google.com.tr" />
+				<data android:host="www.google.com.tw" />
+				<data android:host="www.google.com.ua" />
+				<data android:host="www.google.com.uy" />
+				<data android:host="www.google.com.vc" />
+				<data android:host="www.google.com.vn" />
+				<data android:host="www.google.co.mz" />
+				<data android:host="www.google.co.nz" />
+				<data android:host="www.google.co.th" />
+				<data android:host="www.google.co.tz" />
+				<data android:host="www.google.co.ug" />
+				<data android:host="www.google.co.uk" />
+				<data android:host="www.google.co.uz" />
+				<data android:host="www.google.co.ve" />
+				<data android:host="www.google.co.vi" />
+				<data android:host="www.google.co.za" />
+				<data android:host="www.google.co.zm" />
+				<data android:host="www.google.co.zw" />
+				<data android:host="www.google.cv" />
+				<data android:host="www.google.cz" />
+				<data android:host="www.google.de" />
+				<data android:host="www.google.dj" />
+				<data android:host="www.google.dk" />
+				<data android:host="www.google.dm" />
+				<data android:host="www.google.dz" />
+				<data android:host="www.googlee.com" />
+				<data android:host="www.google.ee" />
+				<data android:host="www.google.es" />
+				<data android:host="www.google.fi" />
+				<data android:host="www.google.fm" />
+				<data android:host="www.google.fr" />
+				<data android:host="www.google.ga" />
+				<data android:host="www.google.ge" />
+				<data android:host="www.google.gf" />
+				<data android:host="www.google.gg" />
+				<data android:host="www.google.gl" />
+				<data android:host="www.google.gm" />
+				<data android:host="www.google.gp" />
+				<data android:host="www.google.gr" />
+				<data android:host="www.google.gy" />
+				<data android:host="www.google.hn" />
+				<data android:host="www.google.hr" />
+				<data android:host="www.google.ht" />
+				<data android:host="www.google.hu" />
+				<data android:host="www.google.ie" />
+				<data android:host="www.google.im" />
+				<data android:host="www.google.io" />
+				<data android:host="www.google.iq" />
+				<data android:host="www.google.ir" />
+				<data android:host="www.google.is" />
+				<data android:host="www.google.it" />
+				<data android:host="www.google.je" />
+				<data android:host="www.google.jo" />
+				<data android:host="www.google.kg" />
+				<data android:host="www.google.ki" />
+				<data android:host="www.google.kz" />
+				<data android:host="www.google.la" />
+				<data android:host="www.google.li" />
+				<data android:host="www.google.lk" />
+				<data android:host="www.google.lt" />
+				<data android:host="www.google.lu" />
+				<data android:host="www.google.lv" />
+				<data android:host="www.google.md" />
+				<data android:host="www.google.me" />
+				<data android:host="www.google.mg" />
+				<data android:host="www.google.mk" />
+				<data android:host="www.google.ml" />
+				<data android:host="www.google.mn" />
+				<data android:host="www.google.ms" />
+				<data android:host="www.google.mu" />
+				<data android:host="www.google.mv" />
+				<data android:host="www.google.mw" />
+				<data android:host="www.google.ne" />
+				<data android:host="www.google.net" />
+				<data android:host="www.google.nl" />
+				<data android:host="www.google.no" />
+				<data android:host="www.google.nr" />
+				<data android:host="www.google.nu" />
+				<data android:host="www.google.org" />
+				<data android:host="www.google.pl" />
+				<data android:host="www.google.pn" />
+				<data android:host="www.google.ps" />
+				<data android:host="www.google.pt" />
+				<data android:host="www.google.ro" />
+				<data android:host="www.google.rs" />
+				<data android:host="www.google.ru" />
+				<data android:host="www.google.rw" />
+				<data android:host="www.google.sc" />
+				<data android:host="www.google.se" />
+				<data android:host="www.google.sh" />
+				<data android:host="www.google.si" />
+				<data android:host="www.google.sk" />
+				<data android:host="www.google.sm" />
+				<data android:host="www.google.sn" />
+				<data android:host="www.google.so" />
+				<data android:host="www.google.st" />
+				<data android:host="www.google.td" />
+				<data android:host="www.google.tg" />
+				<data android:host="www.google.tk" />
+				<data android:host="www.google.tl" />
+				<data android:host="www.google.tm" />
+				<data android:host="www.google.tn" />
+				<data android:host="www.google.to" />
+				<data android:host="www.google.tt" />
+				<data android:host="www.google.us" />
+				<data android:host="www.google.vg" />
+				<data android:host="www.google.vu" />
+				<data android:host="www.google.ws" />
+			</intent-filter>
 		</activity>
 
 		<activity android:name="net.osmand.plus.development.TestVoiceActivity" />