From dc307e4b5f57b28253539b22e19b93e01c97ad60 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sun, 1 Nov 2015 22:55:07 +0100
Subject: [PATCH] Fix #1852

---
 OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java | 1 +
 OsmAnd/src/net/osmand/plus/OsmandSettings.java  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java b/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java
index 69cb5c5443..8fcc647dce 100644
--- a/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java
+++ b/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java
@@ -290,6 +290,7 @@ public class MapPoiTypes {
 							for(String lng : MapRenderingTypes.langs) {
 								parsePoiAdditional(parser, lastCategory, lastFilter, lastType, lng);
 							}
+							parsePoiAdditional(parser, lastCategory, lastFilter, lastType, "en");
 						}
 						parsePoiAdditional(parser, lastCategory, lastFilter, lastType, null);
 					} else if (name.equals("poi_type")) {
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index d08e1b357e..4111dcc987 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -1,6 +1,7 @@
 package net.osmand.plus;
 
 
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -11,7 +12,6 @@ import android.net.NetworkInfo;
 import android.os.Build;
 import android.os.Environment;
 import android.support.annotation.Nullable;
-
 import net.osmand.IndexConstants;
 import net.osmand.StateChangedListener;
 import net.osmand.ValueHolder;
@@ -29,7 +29,6 @@ import net.osmand.plus.helpers.SearchHistoryHelper;
 import net.osmand.plus.render.RendererRegistry;
 import net.osmand.plus.routing.RouteProvider.RouteService;
 import net.osmand.render.RenderingRulesStorage;
-
 import java.io.File;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
@@ -1313,6 +1312,7 @@ public class OsmandSettings {
 				putString(EXTERNAL_STORAGE_DIR_V19, externalStorageDir).commit();
 	}
 
+	@SuppressLint("NewApi")
 	@Nullable
 	public File getSecondaryStorage() {
 		if(Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {