From 49ef49a9194c06164b3297052a371fe567581bf9 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 25 Jul 2016 09:00:32 +0200
Subject: [PATCH] Prepare for 2.4

---
 .../src/net/osmand/search/core/SearchCoreFactory.java        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/OsmAnd-java/src/net/osmand/search/core/SearchCoreFactory.java b/OsmAnd-java/src/net/osmand/search/core/SearchCoreFactory.java
index 76d994e063..ee06ceaa41 100644
--- a/OsmAnd-java/src/net/osmand/search/core/SearchCoreFactory.java
+++ b/OsmAnd-java/src/net/osmand/search/core/SearchCoreFactory.java
@@ -92,8 +92,9 @@ public class SearchCoreFactory {
 				throws IOException {
 			phrase.countUnknownWordsMatch(res);
 			int cnt = resultMatcher.getCount();
-			if(!phrase.getUnknownSearchWords().isEmpty() && api != null) {
-				SearchPhrase nphrase = phrase.selectWord(res, phrase.getUnknownSearchWords(res.otherWordsMatch), 
+			List<String> ws = phrase.getUnknownSearchWords(res.otherWordsMatch);
+			if(!ws.isEmpty() && api != null) {
+				SearchPhrase nphrase = phrase.selectWord(res, ws, 
 						phrase.isLastUnknownSearchWordComplete());
 				SearchResult prev = resultMatcher.setParentSearchResult(res);
 				res.parentSearchResult = prev;