diff --git a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift
index 65f9e8c84d..595d4c9dc8 100644
--- a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift
+++ b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift
@@ -169,9 +169,9 @@ final class CatalogWebViewController: WebViewController {
     let showOnMapPath = "map"
     guard let url = navigationAction.request.url,
       url.scheme == "mapsme" ||
-        url.path.contains("buy_kml") ||
-        url.path.contains(subscribePath) ||
-        url.path.contains(showOnMapPath) else {
+        url.pathComponents.contains("buy_kml") ||
+        url.pathComponents.contains(subscribePath) ||
+        url.pathComponents.contains(showOnMapPath) else {
           super.webView(webView, decidePolicyFor: navigationAction, decisionHandler: decisionHandler)
           return
     }
@@ -180,12 +180,12 @@ final class CatalogWebViewController: WebViewController {
       decisionHandler(.cancel)
     }
 
-    if url.path.contains(subscribePath) {
+    if url.pathComponents.contains(subscribePath) {
       showSubscriptionBannerScreen(SubscriptionGroupType(catalogURL: url))
       return
     }
 
-    if url.path.contains(showOnMapPath) {
+    if url.pathComponents.contains(showOnMapPath) {
       guard let components = url.queryParams() else { return }
       guard let serverId = components["server_id"] else { return }
       showOnMap(serverId)