diff --git a/search/latlon_match.cpp b/search/latlon_match.cpp
index 327fa7a4dc..95741a4cca 100644
--- a/search/latlon_match.cpp
+++ b/search/latlon_match.cpp
@@ -150,7 +150,8 @@ bool MatchLatLonDegree(string const & query, double & lat, double & lon)
   char const * arrPos[] = {nullptr, nullptr, nullptr, nullptr};
   bool arrDegreeSymbol[] = { false, false };
 
-  char const * s = query.c_str();
+  char const * const startQuery = query.c_str();
+  char const * s = startQuery;
   while (true)
   {
     char const * s1 = s;
@@ -178,6 +179,11 @@ bool MatchLatLonDegree(string const & query, double & lat, double & lon)
         break;
       }
     }
+    else if (x < 0 && s == s1 && !(s == startQuery || kSpaces.find(*(s-1)) != string::npos))
+    {
+      // Skip input like "3-8"
+      return false;
+    }
 
     s = s2;
     SkipSpaces(s);
diff --git a/search/search_tests/latlon_match_test.cpp b/search/search_tests/latlon_match_test.cpp
index 2f59288668..58f7f98290 100644
--- a/search/search_tests/latlon_match_test.cpp
+++ b/search/search_tests/latlon_match_test.cpp
@@ -46,12 +46,32 @@ UNIT_TEST(LatLon_Degree_Match)
   TestAlmostEqual(lat, 10.1);
   TestAlmostEqual(lon, 20.2);
 
+  TEST(MatchLatLonDegree("-22.3534 -42.7076\n", lat, lon), ());
+  TestAlmostEqual(lat, -22.3534);
+  TestAlmostEqual(lon, -42.7076);
+
   // The ".123" form is not accepted, so our best-effort
   // parse results in "10" and "20".
   TEST(MatchLatLonDegree(".10, ,20", lat, lon), ());
   TestAlmostEqual(lat, 10.0);
   TestAlmostEqual(lon, 20.0);
 
+  TEST(!MatchLatLonDegree("34-31", lat, lon), ());
+  TEST(!MatchLatLonDegree("34/31", lat, lon), ());
+  TEST(!MatchLatLonDegree("34,31", lat, lon), ());
+
+  /// @todo 5E-5 eats as full double here. This is a very fancy case, but anyway ...
+  TEST(!MatchLatLonDegree("N5E-5", lat, lon), ());
+  TEST(!MatchLatLonDegree("5E-5", lat, lon), ());
+
+  TEST(MatchLatLonDegree("N5W-5", lat, lon), ());
+  TestAlmostEqual(lat, 5);
+  TestAlmostEqual(lon, 5);
+  // Same as "N5 E-5"
+  TEST(MatchLatLonDegree("5 E-5", lat, lon), ());
+  TestAlmostEqual(lat, 5);
+  TestAlmostEqual(lon, -5);
+
   TEST(!MatchLatLonDegree("., .", lat, lon), ());
   TEST(!MatchLatLonDegree("10, .", lat, lon), ());
 
@@ -85,6 +105,14 @@ UNIT_TEST(LatLon_Degree_Match)
   TestAlmostEqual(lat, 55.755830555555556);
   TestAlmostEqual(lon, 37.617672222222222);
 
+  {
+    TEST(MatchLatLonDegree("N-55°45′20.99″ E-37°37′03.62″", lat, lon), ());
+    double lat1, lon1;
+    TEST(MatchLatLonDegree("S55°45′20.99″ W37°37′03.62″", lat1, lon1), ());
+    TestAlmostEqual(lat, lat1);
+    TestAlmostEqual(lon, lon1);
+  }
+
   TEST(MatchLatLonDegree("55°45’20.9916\"N, 37°37’3.6228\"E hsdfjgkdsjbv", lat, lon), ());
   TestAlmostEqual(lat, 55.755831);
   TestAlmostEqual(lon, 37.617673);