diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 4fbedd9922..29dce24341 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -988,8 +988,8 @@
 	<string name="booking_filters_price_category">Ценовая категория</string>
 	<string name="booking_filters_no_results">Поиск не дал результатов</string>
 	<string name="booking_filters_nores_message">Попробуйте задать более общий запрос, уменьшить масштаб карты или сбросить фильтр.</string>
-	<string name="booking_filters_expand_area">Уменьшить масштаб карты</string>
-	<string name="booking_filters_reset">Сбросить фильтр</string>
+	<string name="booking_filters_expand_area_button">Уменьшить масштаб карты</string>
+	<string name="booking_filters_reset_button">Сбросить фильтр</string>
 	<string name="booking_list">Список</string>
 	<string name="booking_based_on_reviews">По %d отзывам об отеле</string>
 	<string name="booking_show_more">Показать еще</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 113d708f10..79b1938e8a 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -809,6 +809,7 @@
 	<string name="download_over_mobile_message">用某些方案或漫遊的話這可能相當昂貴。</string>
 	<string name="error_enter_correct_house_number">輸入正確的門牌號碼</string>
 	<string name="editor_storey_number">樓號（最大 %d）</string>
+	<!-- Error message in Editor when a user tries to set the number of floors for a building higher than 25 -->
 	<string name="error_enter_correct_storey_number">編輯最多 25 層的建築</string>
 	<string name="editor_zip_code">郵遞區號</string>
 	<string name="error_enter_correct_zip_code">輸入正確的郵遞區號</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 9a49f79e19..7870a794c2 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -992,8 +992,8 @@
 	<string name="booking_filters_price_category">Price Category</string>
 	<string name="booking_filters_no_results">No Results Found</string>
 	<string name="booking_filters_nores_message">Try a more general search term, zoom out or reset the filter.</string>
-	<string name="booking_filters_expand_area">Zoom out</string>
-	<string name="booking_filters_reset">Reset Filter</string>
+	<string name="booking_filters_expand_area_button">Zoom out</string>
+	<string name="booking_filters_reset_button">Reset Filter</string>
 	<string name="booking_list">List</string>
 	<string name="booking_based_on_reviews">Based on %d hotel reviews</string>
 	<string name="booking_show_more">Show more</string>
diff --git a/iphone/Maps/ar.lproj/Localizable.strings b/iphone/Maps/ar.lproj/Localizable.strings
index 969344a567..aec5a38859 100644
--- a/iphone/Maps/ar.lproj/Localizable.strings
+++ b/iphone/Maps/ar.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/cs.lproj/Localizable.strings b/iphone/Maps/cs.lproj/Localizable.strings
index 72bbeaa4ab..61b8e4f861 100644
--- a/iphone/Maps/cs.lproj/Localizable.strings
+++ b/iphone/Maps/cs.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/da.lproj/Localizable.strings b/iphone/Maps/da.lproj/Localizable.strings
index 43792dab94..a96073b7a9 100644
--- a/iphone/Maps/da.lproj/Localizable.strings
+++ b/iphone/Maps/da.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/de.lproj/Localizable.strings b/iphone/Maps/de.lproj/Localizable.strings
index 20b35dfd25..622abfd718 100644
--- a/iphone/Maps/de.lproj/Localizable.strings
+++ b/iphone/Maps/de.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/en-GB.lproj/Localizable.strings b/iphone/Maps/en-GB.lproj/Localizable.strings
index 0041bd8512..9d9c4e033d 100644
--- a/iphone/Maps/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/en-GB.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings
index 7b642c1502..9032a28e99 100644
--- a/iphone/Maps/en.lproj/Localizable.strings
+++ b/iphone/Maps/en.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/es.lproj/Localizable.strings b/iphone/Maps/es.lproj/Localizable.strings
index f819fb3c64..8edf56a094 100644
--- a/iphone/Maps/es.lproj/Localizable.strings
+++ b/iphone/Maps/es.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/fi.lproj/Localizable.strings b/iphone/Maps/fi.lproj/Localizable.strings
index 697839394f..127473bb1d 100644
--- a/iphone/Maps/fi.lproj/Localizable.strings
+++ b/iphone/Maps/fi.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/fr.lproj/Localizable.strings b/iphone/Maps/fr.lproj/Localizable.strings
index c07e981ffc..90ce585b83 100644
--- a/iphone/Maps/fr.lproj/Localizable.strings
+++ b/iphone/Maps/fr.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/hu.lproj/Localizable.strings b/iphone/Maps/hu.lproj/Localizable.strings
index 38770655bd..41d18346fa 100644
--- a/iphone/Maps/hu.lproj/Localizable.strings
+++ b/iphone/Maps/hu.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/id.lproj/Localizable.strings b/iphone/Maps/id.lproj/Localizable.strings
index e5fd723b5b..4102ac532c 100644
--- a/iphone/Maps/id.lproj/Localizable.strings
+++ b/iphone/Maps/id.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/it.lproj/Localizable.strings b/iphone/Maps/it.lproj/Localizable.strings
index 9ff4c3b17f..d9c485c9e6 100644
--- a/iphone/Maps/it.lproj/Localizable.strings
+++ b/iphone/Maps/it.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/ja.lproj/Localizable.strings b/iphone/Maps/ja.lproj/Localizable.strings
index 586c4be7e2..609fbc0ea3 100644
--- a/iphone/Maps/ja.lproj/Localizable.strings
+++ b/iphone/Maps/ja.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/ko.lproj/Localizable.strings b/iphone/Maps/ko.lproj/Localizable.strings
index 87d8e2297c..96e5bcf65e 100644
--- a/iphone/Maps/ko.lproj/Localizable.strings
+++ b/iphone/Maps/ko.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/nb.lproj/Localizable.strings b/iphone/Maps/nb.lproj/Localizable.strings
index 4716197484..0e16dea40f 100644
--- a/iphone/Maps/nb.lproj/Localizable.strings
+++ b/iphone/Maps/nb.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/nl.lproj/Localizable.strings b/iphone/Maps/nl.lproj/Localizable.strings
index cbe8cf46ee..a0e9a77568 100644
--- a/iphone/Maps/nl.lproj/Localizable.strings
+++ b/iphone/Maps/nl.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/pl.lproj/Localizable.strings b/iphone/Maps/pl.lproj/Localizable.strings
index ab48307aff..e9f18628a6 100644
--- a/iphone/Maps/pl.lproj/Localizable.strings
+++ b/iphone/Maps/pl.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/pt.lproj/Localizable.strings b/iphone/Maps/pt.lproj/Localizable.strings
index 5826a42e20..df5f2c4661 100644
--- a/iphone/Maps/pt.lproj/Localizable.strings
+++ b/iphone/Maps/pt.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/ro.lproj/Localizable.strings b/iphone/Maps/ro.lproj/Localizable.strings
index 18a9c9e404..5097f926d8 100644
--- a/iphone/Maps/ro.lproj/Localizable.strings
+++ b/iphone/Maps/ro.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/ru.lproj/Localizable.strings b/iphone/Maps/ru.lproj/Localizable.strings
index 7477355ba2..2dc0ad7e45 100644
--- a/iphone/Maps/ru.lproj/Localizable.strings
+++ b/iphone/Maps/ru.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Попробуйте задать более общий запрос, уменьшить масштаб карты или сбросить фильтр.";
 
-"booking_filters_expand_area" = "Уменьшить масштаб карты";
+"booking_filters_expand_area_button" = "Уменьшить масштаб карты";
 
-"booking_filters_reset" = "Сбросить фильтр";
+"booking_filters_reset_button" = "Сбросить фильтр";
 
 "booking_list" = "Список";
 
diff --git a/iphone/Maps/sk.lproj/Localizable.strings b/iphone/Maps/sk.lproj/Localizable.strings
index b9e6f782b3..066cac5272 100644
--- a/iphone/Maps/sk.lproj/Localizable.strings
+++ b/iphone/Maps/sk.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/sv.lproj/Localizable.strings b/iphone/Maps/sv.lproj/Localizable.strings
index 6266c6ae8b..287667347e 100644
--- a/iphone/Maps/sv.lproj/Localizable.strings
+++ b/iphone/Maps/sv.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/th.lproj/Localizable.strings b/iphone/Maps/th.lproj/Localizable.strings
index 249545ecf9..a7ce58337f 100644
--- a/iphone/Maps/th.lproj/Localizable.strings
+++ b/iphone/Maps/th.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/tr.lproj/Localizable.strings b/iphone/Maps/tr.lproj/Localizable.strings
index 6bcb50bbcb..320da7ae76 100644
--- a/iphone/Maps/tr.lproj/Localizable.strings
+++ b/iphone/Maps/tr.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/uk.lproj/Localizable.strings b/iphone/Maps/uk.lproj/Localizable.strings
index 472668376c..831591de87 100644
--- a/iphone/Maps/uk.lproj/Localizable.strings
+++ b/iphone/Maps/uk.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/vi.lproj/Localizable.strings b/iphone/Maps/vi.lproj/Localizable.strings
index 6757d150c0..0463dc5eb1 100644
--- a/iphone/Maps/vi.lproj/Localizable.strings
+++ b/iphone/Maps/vi.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/zh-Hans.lproj/Localizable.strings b/iphone/Maps/zh-Hans.lproj/Localizable.strings
index ae2661b37b..132f7635fd 100644
--- a/iphone/Maps/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/zh-Hans.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/iphone/Maps/zh-Hant.lproj/Localizable.strings b/iphone/Maps/zh-Hant.lproj/Localizable.strings
index c29dbfc876..6e8eff1460 100644
--- a/iphone/Maps/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/zh-Hant.lproj/Localizable.strings
@@ -1668,9 +1668,9 @@
 
 "booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
 
-"booking_filters_expand_area" = "Zoom out";
+"booking_filters_expand_area_button" = "Zoom out";
 
-"booking_filters_reset" = "Reset Filter";
+"booking_filters_reset_button" = "Reset Filter";
 
 "booking_list" = "List";
 
diff --git a/strings.txt b/strings.txt
index e628e4f8f4..8348d29406 100644
--- a/strings.txt
+++ b/strings.txt
@@ -19921,7 +19921,7 @@
     ru = Фильтр
 
   [booking_filters_reset]
-    en = Reset 
+    en = Reset
     ru = Сбросить
 
   [booking_filters_rating]
@@ -19956,11 +19956,11 @@
     en = Try a more general search term, zoom out or reset the filter.
     ru = Попробуйте задать более общий запрос, уменьшить масштаб карты или сбросить фильтр.
 
-  [booking_filters_expand_area]
+  [booking_filters_expand_area_button]
     en = Zoom out
     ru = Уменьшить масштаб карты
 
-  [booking_filters_reset]
+  [booking_filters_reset_button]
     en = Reset Filter
     ru = Сбросить фильтр