diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryMapAddressReaderAdapter.java b/OsmAnd-java/src/net/osmand/binary/BinaryMapAddressReaderAdapter.java
index 696ac74098..5ca2e53894 100644
--- a/OsmAnd-java/src/net/osmand/binary/BinaryMapAddressReaderAdapter.java
+++ b/OsmAnd-java/src/net/osmand/binary/BinaryMapAddressReaderAdapter.java
@@ -56,6 +56,10 @@ public class BinaryMapAddressReaderAdapter {
 			return cities;
 		}
 		
+		public List<String> getAttributeTagsTable() {
+			return attributeTagsTable;
+		}
+		
 		public int getIndexNameOffset() {
 			return indexNameOffset;
 		}
diff --git a/OsmAnd-java/src/net/osmand/binary/CachedOsmandIndexes.java b/OsmAnd-java/src/net/osmand/binary/CachedOsmandIndexes.java
index 7336fc7aee..725f2b1e7c 100644
--- a/OsmAnd-java/src/net/osmand/binary/CachedOsmandIndexes.java
+++ b/OsmAnd-java/src/net/osmand/binary/CachedOsmandIndexes.java
@@ -98,6 +98,9 @@ public class CachedOsmandIndexes {
 				cblock.setType(mr.type);
 				addr.addCities(cblock);
 			}
+			for(String s : index.getAttributeTagsTable()) {
+				addr.addAdditionalTags(s);
+			}
 			fileIndex.addAddressIndex(addr);
 		}
 		
@@ -235,6 +238,9 @@ public class CachedOsmandIndexes {
 				cblock.type = mr.getType();
 				mi.cities.add(cblock);
 			}
+			for(String s : index.getAdditionalTagsList()) {
+				mi.attributeTagsTable.add(s);
+			}
 			reader.addressIndexes.add(mi);
 			reader.indexes.add(mi);
 		}
diff --git a/OsmAnd-java/src/net/osmand/binary/OsmandIndex.java b/OsmAnd-java/src/net/osmand/binary/OsmandIndex.java
index ddfc7adf4a..3eb3b1164c 100644
--- a/OsmAnd-java/src/net/osmand/binary/OsmandIndex.java
+++ b/OsmAnd-java/src/net/osmand/binary/OsmandIndex.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: DataExtractionOSM/src/osmand_index.proto
+// source: osmand_index.proto
 
 package net.osmand.binary;
 
@@ -21,8 +21,7 @@ public final class OsmandIndex {
       return defaultInstance;
     }
     
-    @Override
-	public OsmAndStoredIndex getDefaultInstanceForType() {
+    public OsmAndStoredIndex getDefaultInstanceForType() {
       return defaultInstance;
     }
     
@@ -54,8 +53,7 @@ public final class OsmandIndex {
     
     private void initFields() {
     }
-    @Override
-	public final boolean isInitialized() {
+    public final boolean isInitialized() {
       if (!hasVersion) return false;
       if (!hasDateCreated) return false;
       for (net.osmand.binary.OsmandIndex.FileIndex element : getFileIndexList()) {
@@ -64,8 +62,7 @@ public final class OsmandIndex {
       return true;
     }
     
-    @Override
-	public void writeTo(com.google.protobuf.CodedOutputStream output)
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       if (hasVersion()) {
@@ -80,8 +77,7 @@ public final class OsmandIndex {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
-	public int getSerializedSize() {
+    public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
     
@@ -170,13 +166,11 @@ public final class OsmandIndex {
     }
     
     public static Builder newBuilder() { return Builder.create(); }
-    @Override
-	public Builder newBuilderForType() { return newBuilder(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(net.osmand.binary.OsmandIndex.OsmAndStoredIndex prototype) {
       return newBuilder().mergeFrom(prototype);
     }
-    @Override
-	public Builder toBuilder() { return newBuilder(this); }
+    public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.Builder<
@@ -192,13 +186,11 @@ public final class OsmandIndex {
         return builder;
       }
       
-      @Override
-	protected net.osmand.binary.OsmandIndex.OsmAndStoredIndex internalGetResult() {
+      protected net.osmand.binary.OsmandIndex.OsmAndStoredIndex internalGetResult() {
         return result;
       }
       
-      @Override
-	public Builder clear() {
+      public Builder clear() {
         if (result == null) {
           throw new IllegalStateException(
             "Cannot call clear() after build().");
@@ -207,22 +199,18 @@ public final class OsmandIndex {
         return this;
       }
       
-      @Override
-	public Builder clone() {
+      public Builder clone() {
         return create().mergeFrom(result);
       }
       
-      @Override
-	public net.osmand.binary.OsmandIndex.OsmAndStoredIndex getDefaultInstanceForType() {
+      public net.osmand.binary.OsmandIndex.OsmAndStoredIndex getDefaultInstanceForType() {
         return net.osmand.binary.OsmandIndex.OsmAndStoredIndex.getDefaultInstance();
       }
       
-      @Override
-	public boolean isInitialized() {
+      public boolean isInitialized() {
         return result.isInitialized();
       }
-      @Override
-	public net.osmand.binary.OsmandIndex.OsmAndStoredIndex build() {
+      public net.osmand.binary.OsmandIndex.OsmAndStoredIndex build() {
         if (result != null && !isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -238,8 +226,7 @@ public final class OsmandIndex {
         return buildPartial();
       }
       
-      @Override
-	public net.osmand.binary.OsmandIndex.OsmAndStoredIndex buildPartial() {
+      public net.osmand.binary.OsmandIndex.OsmAndStoredIndex buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
             "build() has already been called on this Builder.");
@@ -253,8 +240,7 @@ public final class OsmandIndex {
         return returnMe;
       }
       
-      @Override
-	public Builder mergeFrom(net.osmand.binary.OsmandIndex.OsmAndStoredIndex other) {
+      public Builder mergeFrom(net.osmand.binary.OsmandIndex.OsmAndStoredIndex other) {
         if (other == net.osmand.binary.OsmandIndex.OsmAndStoredIndex.getDefaultInstance()) return this;
         if (other.hasVersion()) {
           setVersion(other.getVersion());
@@ -271,8 +257,7 @@ public final class OsmandIndex {
         return this;
       }
       
-      @Override
-	public Builder mergeFrom(
+      public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -418,8 +403,7 @@ public final class OsmandIndex {
       return defaultInstance;
     }
     
-    @Override
-	public FileIndex getDefaultInstanceForType() {
+    public FileIndex getDefaultInstanceForType() {
       return defaultInstance;
     }
     
@@ -513,8 +497,7 @@ public final class OsmandIndex {
     
     private void initFields() {
     }
-    @Override
-	public final boolean isInitialized() {
+    public final boolean isInitialized() {
       if (!hasSize) return false;
       if (!hasDateModified) return false;
       if (!hasFileName) return false;
@@ -537,8 +520,7 @@ public final class OsmandIndex {
       return true;
     }
     
-    @Override
-	public void writeTo(com.google.protobuf.CodedOutputStream output)
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       if (hasSize()) {
@@ -571,8 +553,7 @@ public final class OsmandIndex {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
-	public int getSerializedSize() {
+    public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
     
@@ -685,13 +666,11 @@ public final class OsmandIndex {
     }
     
     public static Builder newBuilder() { return Builder.create(); }
-    @Override
-	public Builder newBuilderForType() { return newBuilder(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(net.osmand.binary.OsmandIndex.FileIndex prototype) {
       return newBuilder().mergeFrom(prototype);
     }
-    @Override
-	public Builder toBuilder() { return newBuilder(this); }
+    public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.Builder<
@@ -707,13 +686,11 @@ public final class OsmandIndex {
         return builder;
       }
       
-      @Override
-	protected net.osmand.binary.OsmandIndex.FileIndex internalGetResult() {
+      protected net.osmand.binary.OsmandIndex.FileIndex internalGetResult() {
         return result;
       }
       
-      @Override
-	public Builder clear() {
+      public Builder clear() {
         if (result == null) {
           throw new IllegalStateException(
             "Cannot call clear() after build().");
@@ -722,22 +699,18 @@ public final class OsmandIndex {
         return this;
       }
       
-      @Override
-	public Builder clone() {
+      public Builder clone() {
         return create().mergeFrom(result);
       }
       
-      @Override
-	public net.osmand.binary.OsmandIndex.FileIndex getDefaultInstanceForType() {
+      public net.osmand.binary.OsmandIndex.FileIndex getDefaultInstanceForType() {
         return net.osmand.binary.OsmandIndex.FileIndex.getDefaultInstance();
       }
       
-      @Override
-	public boolean isInitialized() {
+      public boolean isInitialized() {
         return result.isInitialized();
       }
-      @Override
-	public net.osmand.binary.OsmandIndex.FileIndex build() {
+      public net.osmand.binary.OsmandIndex.FileIndex build() {
         if (result != null && !isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -753,8 +726,7 @@ public final class OsmandIndex {
         return buildPartial();
       }
       
-      @Override
-	public net.osmand.binary.OsmandIndex.FileIndex buildPartial() {
+      public net.osmand.binary.OsmandIndex.FileIndex buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
             "build() has already been called on this Builder.");
@@ -784,8 +756,7 @@ public final class OsmandIndex {
         return returnMe;
       }
       
-      @Override
-	public Builder mergeFrom(net.osmand.binary.OsmandIndex.FileIndex other) {
+      public Builder mergeFrom(net.osmand.binary.OsmandIndex.FileIndex other) {
         if (other == net.osmand.binary.OsmandIndex.FileIndex.getDefaultInstance()) return this;
         if (other.hasSize()) {
           setSize(other.getSize());
@@ -832,8 +803,7 @@ public final class OsmandIndex {
         return this;
       }
       
-      @Override
-	public Builder mergeFrom(
+      public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -1254,8 +1224,7 @@ public final class OsmandIndex {
       return defaultInstance;
     }
     
-    @Override
-	public AddressPart getDefaultInstanceForType() {
+    public AddressPart getDefaultInstanceForType() {
       return defaultInstance;
     }
     
@@ -1306,10 +1275,21 @@ public final class OsmandIndex {
       return cities_.get(index);
     }
     
+    // repeated string additionalTags = 9;
+    public static final int ADDITIONALTAGS_FIELD_NUMBER = 9;
+    private java.util.List<java.lang.String> additionalTags_ =
+      java.util.Collections.emptyList();
+    public java.util.List<java.lang.String> getAdditionalTagsList() {
+      return additionalTags_;
+    }
+    public int getAdditionalTagsCount() { return additionalTags_.size(); }
+    public java.lang.String getAdditionalTags(int index) {
+      return additionalTags_.get(index);
+    }
+    
     private void initFields() {
     }
-    @Override
-	public final boolean isInitialized() {
+    public final boolean isInitialized() {
       if (!hasSize) return false;
       if (!hasOffset) return false;
       for (net.osmand.binary.OsmandIndex.CityBlock element : getCitiesList()) {
@@ -1318,8 +1298,7 @@ public final class OsmandIndex {
       return true;
     }
     
-    @Override
-	public void writeTo(com.google.protobuf.CodedOutputStream output)
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       if (hasSize()) {
@@ -1340,11 +1319,13 @@ public final class OsmandIndex {
       for (net.osmand.binary.OsmandIndex.CityBlock element : getCitiesList()) {
         output.writeMessage(8, element);
       }
+      for (java.lang.String element : getAdditionalTagsList()) {
+        output.writeString(9, element);
+      }
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
-	public int getSerializedSize() {
+    public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
     
@@ -1373,6 +1354,15 @@ public final class OsmandIndex {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(8, element);
       }
+      {
+        int dataSize = 0;
+        for (java.lang.String element : getAdditionalTagsList()) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeStringSizeNoTag(element);
+        }
+        size += dataSize;
+        size += 1 * getAdditionalTagsList().size();
+      }
       memoizedSerializedSize = size;
       return size;
     }
@@ -1445,13 +1435,11 @@ public final class OsmandIndex {
     }
     
     public static Builder newBuilder() { return Builder.create(); }
-    @Override
-	public Builder newBuilderForType() { return newBuilder(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(net.osmand.binary.OsmandIndex.AddressPart prototype) {
       return newBuilder().mergeFrom(prototype);
     }
-    @Override
-	public Builder toBuilder() { return newBuilder(this); }
+    public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.Builder<
@@ -1467,13 +1455,11 @@ public final class OsmandIndex {
         return builder;
       }
       
-      @Override
-	protected net.osmand.binary.OsmandIndex.AddressPart internalGetResult() {
+      protected net.osmand.binary.OsmandIndex.AddressPart internalGetResult() {
         return result;
       }
       
-      @Override
-	public Builder clear() {
+      public Builder clear() {
         if (result == null) {
           throw new IllegalStateException(
             "Cannot call clear() after build().");
@@ -1482,22 +1468,18 @@ public final class OsmandIndex {
         return this;
       }
       
-      @Override
-	public Builder clone() {
+      public Builder clone() {
         return create().mergeFrom(result);
       }
       
-      @Override
-	public net.osmand.binary.OsmandIndex.AddressPart getDefaultInstanceForType() {
+      public net.osmand.binary.OsmandIndex.AddressPart getDefaultInstanceForType() {
         return net.osmand.binary.OsmandIndex.AddressPart.getDefaultInstance();
       }
       
-      @Override
-	public boolean isInitialized() {
+      public boolean isInitialized() {
         return result.isInitialized();
       }
-      @Override
-	public net.osmand.binary.OsmandIndex.AddressPart build() {
+      public net.osmand.binary.OsmandIndex.AddressPart build() {
         if (result != null && !isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1513,8 +1495,7 @@ public final class OsmandIndex {
         return buildPartial();
       }
       
-      @Override
-	public net.osmand.binary.OsmandIndex.AddressPart buildPartial() {
+      public net.osmand.binary.OsmandIndex.AddressPart buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
             "build() has already been called on this Builder.");
@@ -1523,13 +1504,16 @@ public final class OsmandIndex {
           result.cities_ =
             java.util.Collections.unmodifiableList(result.cities_);
         }
+        if (result.additionalTags_ != java.util.Collections.EMPTY_LIST) {
+          result.additionalTags_ =
+            java.util.Collections.unmodifiableList(result.additionalTags_);
+        }
         net.osmand.binary.OsmandIndex.AddressPart returnMe = result;
         result = null;
         return returnMe;
       }
       
-      @Override
-	public Builder mergeFrom(net.osmand.binary.OsmandIndex.AddressPart other) {
+      public Builder mergeFrom(net.osmand.binary.OsmandIndex.AddressPart other) {
         if (other == net.osmand.binary.OsmandIndex.AddressPart.getDefaultInstance()) return this;
         if (other.hasSize()) {
           setSize(other.getSize());
@@ -1552,11 +1536,16 @@ public final class OsmandIndex {
           }
           result.cities_.addAll(other.cities_);
         }
+        if (!other.additionalTags_.isEmpty()) {
+          if (result.additionalTags_.isEmpty()) {
+            result.additionalTags_ = new java.util.ArrayList<java.lang.String>();
+          }
+          result.additionalTags_.addAll(other.additionalTags_);
+        }
         return this;
       }
       
-      @Override
-	public Builder mergeFrom(
+      public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -1597,6 +1586,10 @@ public final class OsmandIndex {
               addCities(subBuilder.buildPartial());
               break;
             }
+            case 74: {
+              addAdditionalTags(input.readString());
+              break;
+            }
           }
         }
       }
@@ -1749,6 +1742,46 @@ public final class OsmandIndex {
         return this;
       }
       
+      // repeated string additionalTags = 9;
+      public java.util.List<java.lang.String> getAdditionalTagsList() {
+        return java.util.Collections.unmodifiableList(result.additionalTags_);
+      }
+      public int getAdditionalTagsCount() {
+        return result.getAdditionalTagsCount();
+      }
+      public java.lang.String getAdditionalTags(int index) {
+        return result.getAdditionalTags(index);
+      }
+      public Builder setAdditionalTags(int index, java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  result.additionalTags_.set(index, value);
+        return this;
+      }
+      public Builder addAdditionalTags(java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  if (result.additionalTags_.isEmpty()) {
+          result.additionalTags_ = new java.util.ArrayList<java.lang.String>();
+        }
+        result.additionalTags_.add(value);
+        return this;
+      }
+      public Builder addAllAdditionalTags(
+          java.lang.Iterable<? extends java.lang.String> values) {
+        if (result.additionalTags_.isEmpty()) {
+          result.additionalTags_ = new java.util.ArrayList<java.lang.String>();
+        }
+        super.addAll(values, result.additionalTags_);
+        return this;
+      }
+      public Builder clearAdditionalTags() {
+        result.additionalTags_ = java.util.Collections.emptyList();
+        return this;
+      }
+      
       // @@protoc_insertion_point(builder_scope:AddressPart)
     }
     
@@ -1774,8 +1807,7 @@ public final class OsmandIndex {
       return defaultInstance;
     }
     
-    @Override
-	public CityBlock getDefaultInstanceForType() {
+    public CityBlock getDefaultInstanceForType() {
       return defaultInstance;
     }
     
@@ -1802,16 +1834,14 @@ public final class OsmandIndex {
     
     private void initFields() {
     }
-    @Override
-	public final boolean isInitialized() {
+    public final boolean isInitialized() {
       if (!hasSize) return false;
       if (!hasOffset) return false;
       if (!hasType) return false;
       return true;
     }
     
-    @Override
-	public void writeTo(com.google.protobuf.CodedOutputStream output)
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       if (hasSize()) {
@@ -1826,8 +1856,7 @@ public final class OsmandIndex {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
-	public int getSerializedSize() {
+    public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
     
@@ -1916,13 +1945,11 @@ public final class OsmandIndex {
     }
     
     public static Builder newBuilder() { return Builder.create(); }
-    @Override
-	public Builder newBuilderForType() { return newBuilder(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(net.osmand.binary.OsmandIndex.CityBlock prototype) {
       return newBuilder().mergeFrom(prototype);
     }
-    @Override
-	public Builder toBuilder() { return newBuilder(this); }
+    public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.Builder<
@@ -1938,13 +1965,11 @@ public final class OsmandIndex {
         return builder;
       }
       
-      @Override
-	protected net.osmand.binary.OsmandIndex.CityBlock internalGetResult() {
+      protected net.osmand.binary.OsmandIndex.CityBlock internalGetResult() {
         return result;
       }
       
-      @Override
-	public Builder clear() {
+      public Builder clear() {
         if (result == null) {
           throw new IllegalStateException(
             "Cannot call clear() after build().");
@@ -1953,22 +1978,18 @@ public final class OsmandIndex {
         return this;
       }
       
-      @Override
-	public Builder clone() {
+      public Builder clone() {
         return create().mergeFrom(result);
       }
       
-      @Override
-	public net.osmand.binary.OsmandIndex.CityBlock getDefaultInstanceForType() {
+      public net.osmand.binary.OsmandIndex.CityBlock getDefaultInstanceForType() {
         return net.osmand.binary.OsmandIndex.CityBlock.getDefaultInstance();
       }
       
-      @Override
-	public boolean isInitialized() {
+      public boolean isInitialized() {
         return result.isInitialized();
       }
-      @Override
-	public net.osmand.binary.OsmandIndex.CityBlock build() {
+      public net.osmand.binary.OsmandIndex.CityBlock build() {
         if (result != null && !isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1984,8 +2005,7 @@ public final class OsmandIndex {
         return buildPartial();
       }
       
-      @Override
-	public net.osmand.binary.OsmandIndex.CityBlock buildPartial() {
+      public net.osmand.binary.OsmandIndex.CityBlock buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
             "build() has already been called on this Builder.");
@@ -1995,8 +2015,7 @@ public final class OsmandIndex {
         return returnMe;
       }
       
-      @Override
-	public Builder mergeFrom(net.osmand.binary.OsmandIndex.CityBlock other) {
+      public Builder mergeFrom(net.osmand.binary.OsmandIndex.CityBlock other) {
         if (other == net.osmand.binary.OsmandIndex.CityBlock.getDefaultInstance()) return this;
         if (other.hasSize()) {
           setSize(other.getSize());
@@ -2010,8 +2029,7 @@ public final class OsmandIndex {
         return this;
       }
       
-      @Override
-	public Builder mergeFrom(
+      public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -2122,8 +2140,7 @@ public final class OsmandIndex {
       return defaultInstance;
     }
     
-    @Override
-	public PoiPart getDefaultInstanceForType() {
+    public PoiPart getDefaultInstanceForType() {
       return defaultInstance;
     }
     
@@ -2178,8 +2195,7 @@ public final class OsmandIndex {
     
     private void initFields() {
     }
-    @Override
-	public final boolean isInitialized() {
+    public final boolean isInitialized() {
       if (!hasSize) return false;
       if (!hasOffset) return false;
       if (!hasLeft) return false;
@@ -2189,8 +2205,7 @@ public final class OsmandIndex {
       return true;
     }
     
-    @Override
-	public void writeTo(com.google.protobuf.CodedOutputStream output)
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       if (hasSize()) {
@@ -2217,8 +2232,7 @@ public final class OsmandIndex {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
-	public int getSerializedSize() {
+    public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
     
@@ -2323,13 +2337,11 @@ public final class OsmandIndex {
     }
     
     public static Builder newBuilder() { return Builder.create(); }
-    @Override
-	public Builder newBuilderForType() { return newBuilder(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(net.osmand.binary.OsmandIndex.PoiPart prototype) {
       return newBuilder().mergeFrom(prototype);
     }
-    @Override
-	public Builder toBuilder() { return newBuilder(this); }
+    public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.Builder<
@@ -2345,13 +2357,11 @@ public final class OsmandIndex {
         return builder;
       }
       
-      @Override
-	protected net.osmand.binary.OsmandIndex.PoiPart internalGetResult() {
+      protected net.osmand.binary.OsmandIndex.PoiPart internalGetResult() {
         return result;
       }
       
-      @Override
-	public Builder clear() {
+      public Builder clear() {
         if (result == null) {
           throw new IllegalStateException(
             "Cannot call clear() after build().");
@@ -2360,22 +2370,18 @@ public final class OsmandIndex {
         return this;
       }
       
-      @Override
-	public Builder clone() {
+      public Builder clone() {
         return create().mergeFrom(result);
       }
       
-      @Override
-	public net.osmand.binary.OsmandIndex.PoiPart getDefaultInstanceForType() {
+      public net.osmand.binary.OsmandIndex.PoiPart getDefaultInstanceForType() {
         return net.osmand.binary.OsmandIndex.PoiPart.getDefaultInstance();
       }
       
-      @Override
-	public boolean isInitialized() {
+      public boolean isInitialized() {
         return result.isInitialized();
       }
-      @Override
-	public net.osmand.binary.OsmandIndex.PoiPart build() {
+      public net.osmand.binary.OsmandIndex.PoiPart build() {
         if (result != null && !isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -2391,8 +2397,7 @@ public final class OsmandIndex {
         return buildPartial();
       }
       
-      @Override
-	public net.osmand.binary.OsmandIndex.PoiPart buildPartial() {
+      public net.osmand.binary.OsmandIndex.PoiPart buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
             "build() has already been called on this Builder.");
@@ -2402,8 +2407,7 @@ public final class OsmandIndex {
         return returnMe;
       }
       
-      @Override
-	public Builder mergeFrom(net.osmand.binary.OsmandIndex.PoiPart other) {
+      public Builder mergeFrom(net.osmand.binary.OsmandIndex.PoiPart other) {
         if (other == net.osmand.binary.OsmandIndex.PoiPart.getDefaultInstance()) return this;
         if (other.hasSize()) {
           setSize(other.getSize());
@@ -2429,8 +2433,7 @@ public final class OsmandIndex {
         return this;
       }
       
-      @Override
-	public Builder mergeFrom(
+      public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -2632,8 +2635,7 @@ public final class OsmandIndex {
       return defaultInstance;
     }
     
-    @Override
-	public MapLevel getDefaultInstanceForType() {
+    public MapLevel getDefaultInstanceForType() {
       return defaultInstance;
     }
     
@@ -2695,8 +2697,7 @@ public final class OsmandIndex {
     
     private void initFields() {
     }
-    @Override
-	public final boolean isInitialized() {
+    public final boolean isInitialized() {
       if (!hasSize) return false;
       if (!hasOffset) return false;
       if (!hasLeft) return false;
@@ -2706,8 +2707,7 @@ public final class OsmandIndex {
       return true;
     }
     
-    @Override
-	public void writeTo(com.google.protobuf.CodedOutputStream output)
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       if (hasSize()) {
@@ -2737,8 +2737,7 @@ public final class OsmandIndex {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
-	public int getSerializedSize() {
+    public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
     
@@ -2847,13 +2846,11 @@ public final class OsmandIndex {
     }
     
     public static Builder newBuilder() { return Builder.create(); }
-    @Override
-	public Builder newBuilderForType() { return newBuilder(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(net.osmand.binary.OsmandIndex.MapLevel prototype) {
       return newBuilder().mergeFrom(prototype);
     }
-    @Override
-	public Builder toBuilder() { return newBuilder(this); }
+    public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.Builder<
@@ -2869,13 +2866,11 @@ public final class OsmandIndex {
         return builder;
       }
       
-      @Override
-	protected net.osmand.binary.OsmandIndex.MapLevel internalGetResult() {
+      protected net.osmand.binary.OsmandIndex.MapLevel internalGetResult() {
         return result;
       }
       
-      @Override
-	public Builder clear() {
+      public Builder clear() {
         if (result == null) {
           throw new IllegalStateException(
             "Cannot call clear() after build().");
@@ -2884,22 +2879,18 @@ public final class OsmandIndex {
         return this;
       }
       
-      @Override
-	public Builder clone() {
+      public Builder clone() {
         return create().mergeFrom(result);
       }
       
-      @Override
-	public net.osmand.binary.OsmandIndex.MapLevel getDefaultInstanceForType() {
+      public net.osmand.binary.OsmandIndex.MapLevel getDefaultInstanceForType() {
         return net.osmand.binary.OsmandIndex.MapLevel.getDefaultInstance();
       }
       
-      @Override
-	public boolean isInitialized() {
+      public boolean isInitialized() {
         return result.isInitialized();
       }
-      @Override
-	public net.osmand.binary.OsmandIndex.MapLevel build() {
+      public net.osmand.binary.OsmandIndex.MapLevel build() {
         if (result != null && !isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -2915,8 +2906,7 @@ public final class OsmandIndex {
         return buildPartial();
       }
       
-      @Override
-	public net.osmand.binary.OsmandIndex.MapLevel buildPartial() {
+      public net.osmand.binary.OsmandIndex.MapLevel buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
             "build() has already been called on this Builder.");
@@ -2926,8 +2916,7 @@ public final class OsmandIndex {
         return returnMe;
       }
       
-      @Override
-	public Builder mergeFrom(net.osmand.binary.OsmandIndex.MapLevel other) {
+      public Builder mergeFrom(net.osmand.binary.OsmandIndex.MapLevel other) {
         if (other == net.osmand.binary.OsmandIndex.MapLevel.getDefaultInstance()) return this;
         if (other.hasSize()) {
           setSize(other.getSize());
@@ -2956,8 +2945,7 @@ public final class OsmandIndex {
         return this;
       }
       
-      @Override
-	public Builder mergeFrom(
+      public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -3178,8 +3166,7 @@ public final class OsmandIndex {
       return defaultInstance;
     }
     
-    @Override
-	public MapPart getDefaultInstanceForType() {
+    public MapPart getDefaultInstanceForType() {
       return defaultInstance;
     }
     
@@ -3218,8 +3205,7 @@ public final class OsmandIndex {
     
     private void initFields() {
     }
-    @Override
-	public final boolean isInitialized() {
+    public final boolean isInitialized() {
       if (!hasSize) return false;
       if (!hasOffset) return false;
       for (net.osmand.binary.OsmandIndex.MapLevel element : getLevelsList()) {
@@ -3228,8 +3214,7 @@ public final class OsmandIndex {
       return true;
     }
     
-    @Override
-	public void writeTo(com.google.protobuf.CodedOutputStream output)
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       if (hasSize()) {
@@ -3247,8 +3232,7 @@ public final class OsmandIndex {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
-	public int getSerializedSize() {
+    public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
     
@@ -3341,13 +3325,11 @@ public final class OsmandIndex {
     }
     
     public static Builder newBuilder() { return Builder.create(); }
-    @Override
-	public Builder newBuilderForType() { return newBuilder(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(net.osmand.binary.OsmandIndex.MapPart prototype) {
       return newBuilder().mergeFrom(prototype);
     }
-    @Override
-	public Builder toBuilder() { return newBuilder(this); }
+    public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.Builder<
@@ -3363,13 +3345,11 @@ public final class OsmandIndex {
         return builder;
       }
       
-      @Override
-	protected net.osmand.binary.OsmandIndex.MapPart internalGetResult() {
+      protected net.osmand.binary.OsmandIndex.MapPart internalGetResult() {
         return result;
       }
       
-      @Override
-	public Builder clear() {
+      public Builder clear() {
         if (result == null) {
           throw new IllegalStateException(
             "Cannot call clear() after build().");
@@ -3378,22 +3358,18 @@ public final class OsmandIndex {
         return this;
       }
       
-      @Override
-	public Builder clone() {
+      public Builder clone() {
         return create().mergeFrom(result);
       }
       
-      @Override
-	public net.osmand.binary.OsmandIndex.MapPart getDefaultInstanceForType() {
+      public net.osmand.binary.OsmandIndex.MapPart getDefaultInstanceForType() {
         return net.osmand.binary.OsmandIndex.MapPart.getDefaultInstance();
       }
       
-      @Override
-	public boolean isInitialized() {
+      public boolean isInitialized() {
         return result.isInitialized();
       }
-      @Override
-	public net.osmand.binary.OsmandIndex.MapPart build() {
+      public net.osmand.binary.OsmandIndex.MapPart build() {
         if (result != null && !isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -3409,8 +3385,7 @@ public final class OsmandIndex {
         return buildPartial();
       }
       
-      @Override
-	public net.osmand.binary.OsmandIndex.MapPart buildPartial() {
+      public net.osmand.binary.OsmandIndex.MapPart buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
             "build() has already been called on this Builder.");
@@ -3424,8 +3399,7 @@ public final class OsmandIndex {
         return returnMe;
       }
       
-      @Override
-	public Builder mergeFrom(net.osmand.binary.OsmandIndex.MapPart other) {
+      public Builder mergeFrom(net.osmand.binary.OsmandIndex.MapPart other) {
         if (other == net.osmand.binary.OsmandIndex.MapPart.getDefaultInstance()) return this;
         if (other.hasSize()) {
           setSize(other.getSize());
@@ -3445,8 +3419,7 @@ public final class OsmandIndex {
         return this;
       }
       
-      @Override
-	public Builder mergeFrom(
+      public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -3617,8 +3590,7 @@ public final class OsmandIndex {
       return defaultInstance;
     }
     
-    @Override
-	public RoutingSubregion getDefaultInstanceForType() {
+    public RoutingSubregion getDefaultInstanceForType() {
       return defaultInstance;
     }
     
@@ -3680,8 +3652,7 @@ public final class OsmandIndex {
     
     private void initFields() {
     }
-    @Override
-	public final boolean isInitialized() {
+    public final boolean isInitialized() {
       if (!hasSize) return false;
       if (!hasOffset) return false;
       if (!hasLeft) return false;
@@ -3692,8 +3663,7 @@ public final class OsmandIndex {
       return true;
     }
     
-    @Override
-	public void writeTo(com.google.protobuf.CodedOutputStream output)
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       if (hasSize()) {
@@ -3723,8 +3693,7 @@ public final class OsmandIndex {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
-	public int getSerializedSize() {
+    public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
     
@@ -3833,13 +3802,11 @@ public final class OsmandIndex {
     }
     
     public static Builder newBuilder() { return Builder.create(); }
-    @Override
-	public Builder newBuilderForType() { return newBuilder(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(net.osmand.binary.OsmandIndex.RoutingSubregion prototype) {
       return newBuilder().mergeFrom(prototype);
     }
-    @Override
-	public Builder toBuilder() { return newBuilder(this); }
+    public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.Builder<
@@ -3855,13 +3822,11 @@ public final class OsmandIndex {
         return builder;
       }
       
-      @Override
-	protected net.osmand.binary.OsmandIndex.RoutingSubregion internalGetResult() {
+      protected net.osmand.binary.OsmandIndex.RoutingSubregion internalGetResult() {
         return result;
       }
       
-      @Override
-	public Builder clear() {
+      public Builder clear() {
         if (result == null) {
           throw new IllegalStateException(
             "Cannot call clear() after build().");
@@ -3870,22 +3835,18 @@ public final class OsmandIndex {
         return this;
       }
       
-      @Override
-	public Builder clone() {
+      public Builder clone() {
         return create().mergeFrom(result);
       }
       
-      @Override
-	public net.osmand.binary.OsmandIndex.RoutingSubregion getDefaultInstanceForType() {
+      public net.osmand.binary.OsmandIndex.RoutingSubregion getDefaultInstanceForType() {
         return net.osmand.binary.OsmandIndex.RoutingSubregion.getDefaultInstance();
       }
       
-      @Override
-	public boolean isInitialized() {
+      public boolean isInitialized() {
         return result.isInitialized();
       }
-      @Override
-	public net.osmand.binary.OsmandIndex.RoutingSubregion build() {
+      public net.osmand.binary.OsmandIndex.RoutingSubregion build() {
         if (result != null && !isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -3901,8 +3862,7 @@ public final class OsmandIndex {
         return buildPartial();
       }
       
-      @Override
-	public net.osmand.binary.OsmandIndex.RoutingSubregion buildPartial() {
+      public net.osmand.binary.OsmandIndex.RoutingSubregion buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
             "build() has already been called on this Builder.");
@@ -3912,8 +3872,7 @@ public final class OsmandIndex {
         return returnMe;
       }
       
-      @Override
-	public Builder mergeFrom(net.osmand.binary.OsmandIndex.RoutingSubregion other) {
+      public Builder mergeFrom(net.osmand.binary.OsmandIndex.RoutingSubregion other) {
         if (other == net.osmand.binary.OsmandIndex.RoutingSubregion.getDefaultInstance()) return this;
         if (other.hasSize()) {
           setSize(other.getSize());
@@ -3942,8 +3901,7 @@ public final class OsmandIndex {
         return this;
       }
       
-      @Override
-	public Builder mergeFrom(
+      public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -4164,8 +4122,7 @@ public final class OsmandIndex {
       return defaultInstance;
     }
     
-    @Override
-	public RoutingPart getDefaultInstanceForType() {
+    public RoutingPart getDefaultInstanceForType() {
       return defaultInstance;
     }
     
@@ -4204,8 +4161,7 @@ public final class OsmandIndex {
     
     private void initFields() {
     }
-    @Override
-	public final boolean isInitialized() {
+    public final boolean isInitialized() {
       if (!hasSize) return false;
       if (!hasOffset) return false;
       for (net.osmand.binary.OsmandIndex.RoutingSubregion element : getSubregionsList()) {
@@ -4214,8 +4170,7 @@ public final class OsmandIndex {
       return true;
     }
     
-    @Override
-	public void writeTo(com.google.protobuf.CodedOutputStream output)
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       if (hasSize()) {
@@ -4233,8 +4188,7 @@ public final class OsmandIndex {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
-	public int getSerializedSize() {
+    public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
     
@@ -4327,13 +4281,11 @@ public final class OsmandIndex {
     }
     
     public static Builder newBuilder() { return Builder.create(); }
-    @Override
-	public Builder newBuilderForType() { return newBuilder(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(net.osmand.binary.OsmandIndex.RoutingPart prototype) {
       return newBuilder().mergeFrom(prototype);
     }
-    @Override
-	public Builder toBuilder() { return newBuilder(this); }
+    public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.Builder<
@@ -4349,13 +4301,11 @@ public final class OsmandIndex {
         return builder;
       }
       
-      @Override
-	protected net.osmand.binary.OsmandIndex.RoutingPart internalGetResult() {
+      protected net.osmand.binary.OsmandIndex.RoutingPart internalGetResult() {
         return result;
       }
       
-      @Override
-	public Builder clear() {
+      public Builder clear() {
         if (result == null) {
           throw new IllegalStateException(
             "Cannot call clear() after build().");
@@ -4364,22 +4314,18 @@ public final class OsmandIndex {
         return this;
       }
       
-      @Override
-	public Builder clone() {
+      public Builder clone() {
         return create().mergeFrom(result);
       }
       
-      @Override
-	public net.osmand.binary.OsmandIndex.RoutingPart getDefaultInstanceForType() {
+      public net.osmand.binary.OsmandIndex.RoutingPart getDefaultInstanceForType() {
         return net.osmand.binary.OsmandIndex.RoutingPart.getDefaultInstance();
       }
       
-      @Override
-	public boolean isInitialized() {
+      public boolean isInitialized() {
         return result.isInitialized();
       }
-      @Override
-	public net.osmand.binary.OsmandIndex.RoutingPart build() {
+      public net.osmand.binary.OsmandIndex.RoutingPart build() {
         if (result != null && !isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -4395,8 +4341,7 @@ public final class OsmandIndex {
         return buildPartial();
       }
       
-      @Override
-	public net.osmand.binary.OsmandIndex.RoutingPart buildPartial() {
+      public net.osmand.binary.OsmandIndex.RoutingPart buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
             "build() has already been called on this Builder.");
@@ -4410,8 +4355,7 @@ public final class OsmandIndex {
         return returnMe;
       }
       
-      @Override
-	public Builder mergeFrom(net.osmand.binary.OsmandIndex.RoutingPart other) {
+      public Builder mergeFrom(net.osmand.binary.OsmandIndex.RoutingPart other) {
         if (other == net.osmand.binary.OsmandIndex.RoutingPart.getDefaultInstance()) return this;
         if (other.hasSize()) {
           setSize(other.getSize());
@@ -4431,8 +4375,7 @@ public final class OsmandIndex {
         return this;
       }
       
-      @Override
-	public Builder mergeFrom(
+      public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -4603,8 +4546,7 @@ public final class OsmandIndex {
       return defaultInstance;
     }
     
-    @Override
-	public TransportPart getDefaultInstanceForType() {
+    public TransportPart getDefaultInstanceForType() {
       return defaultInstance;
     }
     
@@ -4687,15 +4629,13 @@ public final class OsmandIndex {
     
     private void initFields() {
     }
-    @Override
-	public final boolean isInitialized() {
+    public final boolean isInitialized() {
       if (!hasSize) return false;
       if (!hasOffset) return false;
       return true;
     }
     
-    @Override
-	public void writeTo(com.google.protobuf.CodedOutputStream output)
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       if (hasSize()) {
@@ -4734,8 +4674,7 @@ public final class OsmandIndex {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
-	public int getSerializedSize() {
+    public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
     
@@ -4856,13 +4795,11 @@ public final class OsmandIndex {
     }
     
     public static Builder newBuilder() { return Builder.create(); }
-    @Override
-	public Builder newBuilderForType() { return newBuilder(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(net.osmand.binary.OsmandIndex.TransportPart prototype) {
       return newBuilder().mergeFrom(prototype);
     }
-    @Override
-	public Builder toBuilder() { return newBuilder(this); }
+    public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.Builder<
@@ -4878,13 +4815,11 @@ public final class OsmandIndex {
         return builder;
       }
       
-      @Override
-	protected net.osmand.binary.OsmandIndex.TransportPart internalGetResult() {
+      protected net.osmand.binary.OsmandIndex.TransportPart internalGetResult() {
         return result;
       }
       
-      @Override
-	public Builder clear() {
+      public Builder clear() {
         if (result == null) {
           throw new IllegalStateException(
             "Cannot call clear() after build().");
@@ -4893,22 +4828,18 @@ public final class OsmandIndex {
         return this;
       }
       
-      @Override
-	public Builder clone() {
+      public Builder clone() {
         return create().mergeFrom(result);
       }
       
-      @Override
-	public net.osmand.binary.OsmandIndex.TransportPart getDefaultInstanceForType() {
+      public net.osmand.binary.OsmandIndex.TransportPart getDefaultInstanceForType() {
         return net.osmand.binary.OsmandIndex.TransportPart.getDefaultInstance();
       }
       
-      @Override
-	public boolean isInitialized() {
+      public boolean isInitialized() {
         return result.isInitialized();
       }
-      @Override
-	public net.osmand.binary.OsmandIndex.TransportPart build() {
+      public net.osmand.binary.OsmandIndex.TransportPart build() {
         if (result != null && !isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -4924,8 +4855,7 @@ public final class OsmandIndex {
         return buildPartial();
       }
       
-      @Override
-	public net.osmand.binary.OsmandIndex.TransportPart buildPartial() {
+      public net.osmand.binary.OsmandIndex.TransportPart buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
             "build() has already been called on this Builder.");
@@ -4935,8 +4865,7 @@ public final class OsmandIndex {
         return returnMe;
       }
       
-      @Override
-	public Builder mergeFrom(net.osmand.binary.OsmandIndex.TransportPart other) {
+      public Builder mergeFrom(net.osmand.binary.OsmandIndex.TransportPart other) {
         if (other == net.osmand.binary.OsmandIndex.TransportPart.getDefaultInstance()) return this;
         if (other.hasSize()) {
           setSize(other.getSize());
@@ -4974,8 +4903,7 @@ public final class OsmandIndex {
         return this;
       }
       
-      @Override
-	public Builder mergeFrom(
+      public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {