diff --git a/ayanova/src/views/home-user-settings.vue b/ayanova/src/views/home-user-settings.vue
index 4960d529..74d55eb2 100644
--- a/ayanova/src/views/home-user-settings.vue
+++ b/ayanova/src/views/home-user-settings.vue
@@ -201,12 +201,12 @@ export default {
           {
             name: "Waze",
             value:
-              "https://www.waze.com/ul?ll={aylatitude},{aylongitude}&navigate=yes&zoom=17"
+              "https://waze.com/ul?q={ayaddress}<|>https://www.waze.com/ul?ll={aylatitude},{aylongitude}&navigate=yes&zoom=17"
           },
           {
             name: "Yandex",
             value:
-              "https://yandex.ru/maps/?ll={aylatitude},{aylongitude}&z=12&l=map"
+              "https://yandex.ru/maps/?mode=search&text={ayaddress}&z=17<|>https://yandex.ru/maps/?ll={aylatitude},{aylongitude}&z=12&l=map"
           }
         ]
       },