diff --git a/data/banners.txt b/data/banners.txt
index f202ac1ed6..651837c9cd 100644
--- a/data/banners.txt
+++ b/data/banners.txt
@@ -1,10 +1,34 @@
-[deliveryclub_ru]
-start = 2016-12-01
+# List of banner types.
+#
+# Each section in [square_quotes] corresponds to classificator type sponsored|banner|section_name.
+# Inside a section, use following variables:
+# - start=YYYY-MM-DD and end=YYYY-MM-DD: banner visibility period.
+# - url=http://...: default banner URL, use templated vars in {quotes}.
+# - icon: icon URL.
+# - messages: base substring for messages, default is "banner_sectionname".
+# Other variables can be used in URL templates.
+
+[lamoda_ru]
 end = 2017-01-15
-icon =
-url = http://fas.st/VtumFw
-aux = test
+url = http://fas.st/l1YJbD
 
 [lamoda_ua]
-start = 2016-12-01
+end = 2017-01-15
+url = http://fas.st/naNtn
+
+[deliveryclub]
+end = 2017-01-15
+url = http://fas.st/VtumFw
+
+[tutu]
+end = 2017-01-15
+url = http://fas.st/S9AciK
+
+[geerbest]
+end = 2017-01-15
+
+[rentalcars]
+end = 2017-01-15
+
+[viator]
 end = 2017-01-15
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index ba14da09a9..71d86de93c 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1137,3 +1137,10 @@ olympics|stadium;1136;
 olympics|water_sport;1137;
 olympics|bike_sport;1138;
 sponsored|opentable;1139;
+sponsored|banner|lamoda_ru;1140;
+sponsored|banner|lamoda_ua;1141;
+sponsored|banner|deliveryclub;1142;
+sponsored|banner|tutu;1143;
+sponsored|banner|geerbest;1144;
+sponsored|banner|rentalcars;1145;
+sponsored|banner|viator;1146;
diff --git a/data/mixed_tags.txt b/data/mixed_tags.txt
index b86547d45f..c506e55518 100644
--- a/data/mixed_tags.txt
+++ b/data/mixed_tags.txt
@@ -1,3 +1,3 @@
 # List of additional categories for OSM objects.
-# Format: type,id,category
+# Format: type,id,key1=value1,key2=value2,...
 # Example: way,34306743,olympics=stadium
diff --git a/data/styles/legacy/include/base_other.mapcss b/data/styles/legacy/include/base_other.mapcss
index a47228526c..d9584b5417 100644
--- a/data/styles/legacy/include/base_other.mapcss
+++ b/data/styles/legacy/include/base_other.mapcss
@@ -602,8 +602,7 @@ line|z16[man_made=pipeline][location=overground]
   linecap: butt;
 }
 area|z16-[amenity=restaurant],
-node|z16-[amenity=restaurant],
-node|z16-[sponsored=opentable]
+node|z16-[amenity=restaurant]
 {
   icon-image: restaurant.svg;
 }
@@ -729,8 +728,6 @@ node|z16-[tourism=hostel]
 area|z16-[tourism=hotel],
 area|z16-[tourism=motel],
 node|z16-[tourism=hotel],
-area|z18-[sponsored],
-node|z18-[sponsored],
 node|z16-[tourism=motel]
 {
   icon-image: hotel.svg;
diff --git a/indexer/feature_visibility.cpp b/indexer/feature_visibility.cpp
index 75790733e0..20adbd8853 100644
--- a/indexer/feature_visibility.cpp
+++ b/indexer/feature_visibility.cpp
@@ -214,6 +214,7 @@ namespace
     static const uint32_t hwtag = classif().GetTypeByPath({ "hwtag" });
     static const uint32_t psurface = classif().GetTypeByPath({ "psurface" });
     static const uint32_t wheelchair = classif().GetTypeByPath({ "wheelchair" });
+    static const uint32_t sponsored = classif().GetTypeByPath({ "sponsored" });
 
     // Caching type length to exclude generic [wheelchair].
     uint8_t const typeLength = ftype::GetLevel(type);
@@ -236,6 +237,9 @@ namespace
     if (wheelchair == type && typeLength == 2)
       return true;
 
+    if (sponsored == type)
+      return true;
+
     return false;
   }
 }