diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 61cf115844..7c8ab7f066 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -423,7 +423,7 @@
 	<!-- Settings item title -->
 	<string name="pref_calibration_title">Compass calibration</string>
 	<!-- Search Suggestion -->
-	<string name="wifi">Wi-Fi</string>
+	<string name="wifi">WiFi</string>
 	<!-- Update map suggestion -->
 	<string name="routing_map_outdated">Please update the map to create a route</string>
 	<!-- Update maps suggestion -->
diff --git a/data/categories.txt b/data/categories.txt
index a748cc5866..4137680f45 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -5565,35 +5565,35 @@ sk:Oceán
 sw:Bahari
 
 @wifi
-en:WiFi
-ru:WiFi
+en:WiFi|Wi-Fi
+ru:WiFi|Wi-Fi
 ar:وايفاي
-cs:WiFi
-da:WiFi
-nl:WiFi
-fi:WiFi
-fr:WiFi
-de:WLAN|WiFi
-hu:WiFi
-id:WiFi
-it:WiFi
+cs:WiFi|Wi-Fi
+da:WiFi|Wi-Fi
+nl:WiFi|Wi-Fi
+fi:WiFi|Wi-Fi
+fr:WiFi|Wi-Fi
+de:WLAN|WiFi|Wi-Fi
+hu:WiFi|Wi-Fi
+id:WiFi|Wi-Fi
+it:WiFi|Wi-Fi
 ja:無線LAN
-ko:WiFi인터넷|WiFi 인터넷
-nb:WiFi
-pl:WiFi
-pt:WiFi
-ro:WiFi
-es:WiFi
-sv:WiFi
-th:WiFi
-tr:WiFi
-uk:WiFi
-vi:WiFi
+ko:WiFi인터넷|WiFi 인터넷|Wi-Fi인터넷|Wi-Fi 인터넷
+nb:WiFi|Wi-Fi
+pl:WiFi|Wi-Fi
+pt:WiFi|Wi-Fi
+ro:WiFi|Wi-Fi
+es:WiFi|Wi-Fi
+sv:WiFi|Wi-Fi
+th:WiFi|Wi-Fi
+tr:WiFi|Wi-Fi
+uk:WiFi|Wi-Fi
+vi:WiFi|Wi-Fi
 zh-Hans:无线网络
 zh-Hant:無線網路
-el:WiFi
-sk:WiFi
-sw:WiFi
+el:WiFi|Wi-Fi
+sk:WiFi|Wi-Fi
+sw:WiFi|Wi-Fi
 
 internet_access|internet_access-wlan|@wifi
 en:3^Internet|U+1F4F6
diff --git a/indexer/categories_holder.cpp b/indexer/categories_holder.cpp
index 793cbc8f41..df6eed5ad5 100644
--- a/indexer/categories_holder.cpp
+++ b/indexer/categories_holder.cpp
@@ -225,9 +225,11 @@ bool CategoriesHolder::ValidKeyToken(StringT const & s)
     return true;
 
   /// @todo We need to have global stop words array for the most used languages.
-  for (char const * token : {"a", "z", "s", "d", "di", "de", "le", "wi", "fi", "ra", "ao"})
+  for (char const * token : {"a", "z", "s", "d", "di", "de", "le", "ra", "ao"})
+  {
     if (s.IsEqualAscii(token))
       return false;
+  }
 
   return true;
 }
diff --git a/search/search_integration_tests/processor_test.cpp b/search/search_integration_tests/processor_test.cpp
index b7e0be0ef1..0affd84bf2 100644
--- a/search/search_integration_tests/processor_test.cpp
+++ b/search/search_integration_tests/processor_test.cpp
@@ -677,6 +677,8 @@ UNIT_CLASS_TEST(ProcessorTest, TestCategories)
   TEST(ResultsMatch("#void-", TRules{}), ());
 
   TEST(ResultsMatch("wifi", {ExactMatch(wonderlandId, cafe)}), ());
+  TEST(ResultsMatch("wi-fi", {ExactMatch(wonderlandId, cafe)}), ());
+  TEST(ResultsMatch("wai-fai", TRules{}), ());
   TEST(ResultsMatch("toilet", {ExactMatch(wonderlandId, toi)}), ());
   TEST(ResultsMatch("beach ",
                     {ExactMatch(wonderlandId, nonameBeach), ExactMatch(wonderlandId, namedBeach)}),
diff --git a/strings.txt b/strings.txt
index 527d1d288c..188de92199 100644
--- a/strings.txt
+++ b/strings.txt
@@ -7237,7 +7237,7 @@
   [wifi]
     comment = Search Suggestion
     tags = ios,android,tizen
-    en = Wi-Fi
+    en = WiFi
     ru = WiFi
     ar = واي فاي
     cs = WiFi