diff --git a/data/classificator.txt b/data/classificator.txt
index 3b2fb41d00..c87159a1f2 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -853,12 +853,17 @@ world  +
         {}
     shop  +
         alcohol  -
+        antiques  -
+        art  -
+        baby_goods  -
+        bag  -
         bakery  -
         beauty  -
         beverages  -
         bicycle  -
         bookmaker  -
         books  -
+        boutique  -
         butcher  -
         car  -
         car_parts  -
@@ -866,6 +871,8 @@ world  +
             tyres  -
             {}
         caravan  -
+        charity  -
+        cheese  -
         chemist  -
         chocolate  -
         clothes  -
@@ -875,50 +882,74 @@ world  +
         convenience  -
         copyshop  -
         cosmetics  -
+        craft  -
+        dairy  -
+        deli  -
         department_store  -
         doityourself  -
         dry_cleaning  -
+        electrical  -
         electronics  -
         erotic  -
         fabric  -
+        farm  -
+        fishing  -
         florist  -
         funeral_directors  -
         furniture  -
         garden_centre  -
         gift  -
         greengrocer  -
+        grocery  -
         hairdresser  -
         hardware  -
+        health_food  -
+        houseware  -
+        interior_decoration  -
         jewelry  -
         kiosk  -
+        kitchen  -
         laundry  -
+        lottery  -
         mall  -
         massage  -
+        medical_supply  -
         mobile_phone  -
         money_lender  -
         motorcycle  -
         music  -
         musical_instrument  -
         newsagent  -
+        nutrition_supplements  -
         optician  -
         outdoor  -
+        paint  -
+        pastry  -
         pawnbroker  -
+        perfumery  -
         pet  -
         photo  -
         seafood  -
+        second_hand  -
+        sewing  -
         shoes  -
         sports  -
         stationery  -
+        storage_rental  -
         supermarket  -
         tattoo  -
         tea  -
         ticket  -
+        tobacco  -
         toys  -
+        trade  -
         travel_agency  -
         tyres  -
         variety_store  -
         video  -
         video_games  -
+        watches  -
+        wholesale  -
         wine  -
         {}
     sport  +
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 7a4caaa050..8f98409986 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 886e20b562..73cba6a779 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -60969,6 +60969,274 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-antiques"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-art"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-baby_goods"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-bag"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-bakery"
   element {
@@ -61389,6 +61657,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-boutique"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-butcher"
   element {
@@ -61825,6 +62160,140 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-charity"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-cheese"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-chemist"
   element {
@@ -62452,6 +62921,210 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-craft"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-dairy"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-deli"
+  element {
+    scale: 16
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-department_store"
   element {
@@ -62662,6 +63335,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-electrical"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-electronics"
   element {
@@ -62869,6 +63609,143 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-farm"
+  element {
+    scale: 16
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-fishing"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-florist"
   element {
@@ -63289,6 +64166,76 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-grocery"
+  element {
+    scale: 16
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-hairdresser"
   element {
@@ -63429,6 +64376,213 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-health_food"
+  element {
+    scale: 16
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-houseware"
+  element {
+    scale: 16
+    symbol {
+      name: "doityourself-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "doityourself-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "doityourself-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "doityourself-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-interior_decoration"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-jewelry"
   element {
@@ -63569,6 +64723,76 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-kitchen"
+  element {
+    scale: 16
+    symbol {
+      name: "furniture-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "furniture-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "furniture-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "furniture-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-laundry"
   element {
@@ -63639,6 +64863,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-lottery"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-mall"
   element {
@@ -63807,6 +65098,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-medical_supply"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-mobile_phone"
   element {
@@ -64227,6 +65585,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-nutrition_supplements"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-optician"
   element {
@@ -64367,6 +65792,143 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-paint"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-pastry"
+  element {
+    scale: 16
+    symbol {
+      name: "bakery-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "bakery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "bakery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "bakery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-pawnbroker"
   element {
@@ -64437,6 +65999,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-perfumery"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-pet"
   element {
@@ -64647,6 +66276,140 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-second_hand"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-sewing"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-shoes"
   element {
@@ -64857,6 +66620,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-storage_rental"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-supermarket"
   element {
@@ -65163,6 +66993,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-tobacco"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-toys"
   element {
@@ -65233,6 +67130,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-trade"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-travel_agency"
   element {
@@ -65577,6 +67541,140 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-watches"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-wholesale"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-wine"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index a9455bd79a..aa29c74199 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index f94e6546c8..f0fd71c736 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -60495,6 +60495,274 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-antiques"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-art"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-baby_goods"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-bag"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-bakery"
   element {
@@ -60915,6 +61183,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-boutique"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-butcher"
   element {
@@ -61351,6 +61686,140 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-charity"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-cheese"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-chemist"
   element {
@@ -61978,6 +62447,210 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-craft"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-dairy"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-deli"
+  element {
+    scale: 16
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-department_store"
   element {
@@ -62188,6 +62861,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-electrical"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-electronics"
   element {
@@ -62395,6 +63135,143 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-farm"
+  element {
+    scale: 16
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-fishing"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-florist"
   element {
@@ -62815,6 +63692,76 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-grocery"
+  element {
+    scale: 16
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-hairdresser"
   element {
@@ -62955,6 +63902,213 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-health_food"
+  element {
+    scale: 16
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-houseware"
+  element {
+    scale: 16
+    symbol {
+      name: "doityourself-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "doityourself-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "doityourself-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "doityourself-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-interior_decoration"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-jewelry"
   element {
@@ -63095,6 +64249,76 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-kitchen"
+  element {
+    scale: 16
+    symbol {
+      name: "furniture-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "furniture-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "furniture-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "furniture-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-laundry"
   element {
@@ -63165,6 +64389,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-lottery"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-mall"
   element {
@@ -63333,6 +64624,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-medical_supply"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-mobile_phone"
   element {
@@ -63753,6 +65111,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-nutrition_supplements"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-optician"
   element {
@@ -63893,6 +65318,143 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-paint"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-pastry"
+  element {
+    scale: 16
+    symbol {
+      name: "bakery-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "bakery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "bakery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "bakery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-pawnbroker"
   element {
@@ -63963,6 +65525,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-perfumery"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-pet"
   element {
@@ -64173,6 +65802,140 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-second_hand"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-sewing"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-shoes"
   element {
@@ -64383,6 +66146,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-storage_rental"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-supermarket"
   element {
@@ -64657,6 +66487,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-tobacco"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-toys"
   element {
@@ -64727,6 +66624,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-trade"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-travel_agency"
   element {
@@ -65071,6 +67035,140 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-watches"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-wholesale"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-wine"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index b7ac6da227..92a95340cd 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 60fee96993..13f6a4e501 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -60580,6 +60580,274 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-antiques"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-art"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-baby_goods"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-bag"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-bakery"
   element {
@@ -61000,6 +61268,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-boutique"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-butcher"
   element {
@@ -61436,6 +61771,140 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-charity"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-cheese"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-chemist"
   element {
@@ -62063,6 +62532,210 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-craft"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-dairy"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-deli"
+  element {
+    scale: 16
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-department_store"
   element {
@@ -62273,6 +62946,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-electrical"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-electronics"
   element {
@@ -62480,6 +63220,143 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-farm"
+  element {
+    scale: 16
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-fishing"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-florist"
   element {
@@ -62900,6 +63777,76 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-grocery"
+  element {
+    scale: 16
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-hairdresser"
   element {
@@ -63040,6 +63987,213 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-health_food"
+  element {
+    scale: 16
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "grocery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-houseware"
+  element {
+    scale: 16
+    symbol {
+      name: "doityourself-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "doityourself-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "doityourself-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "doityourself-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-interior_decoration"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-jewelry"
   element {
@@ -63180,6 +64334,76 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-kitchen"
+  element {
+    scale: 16
+    symbol {
+      name: "furniture-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "furniture-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "furniture-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "furniture-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-laundry"
   element {
@@ -63250,6 +64474,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-lottery"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-mall"
   element {
@@ -63418,6 +64709,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-medical_supply"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-mobile_phone"
   element {
@@ -63838,6 +65196,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-nutrition_supplements"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-optician"
   element {
@@ -63978,6 +65403,143 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-paint"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-pastry"
+  element {
+    scale: 16
+    symbol {
+      name: "bakery-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "bakery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "bakery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "bakery-m"
+      priority: 16605
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-pawnbroker"
   element {
@@ -64048,6 +65610,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-perfumery"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-pet"
   element {
@@ -64258,6 +65887,140 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-second_hand"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-sewing"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-shoes"
   element {
@@ -64468,6 +66231,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-storage_rental"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-supermarket"
   element {
@@ -64742,6 +66572,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-tobacco"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-toys"
   element {
@@ -64812,6 +66709,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-trade"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-travel_agency"
   element {
@@ -65156,6 +67120,140 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-watches"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
+cont {
+  name: "shop-wholesale"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16605
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15605
+    }
+  }
+}
 cont {
   name: "shop-wine"
   element {
diff --git a/data/types.txt b/data/types.txt
index dc703da04f..abca8fb220 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -910,11 +910,11 @@ mapswithme
 railway|subway|tunnel
 mapswithme
 *historic|ship
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
+*shop|tobacco
+*shop|farm
+*shop|storage_rental
+*shop|trade
+*shop|deli
 *shop|mall
 *shop|doityourself
 *place|sea
@@ -1075,7 +1075,7 @@ route|ferry
 *amenity|vending_machine|drinks
 *amenity|waste_basket
 *building|garage
-mapswithme
+*shop|pastry
 *emergency|phone
 *highway|rest_area
 *highway|traffic_signals
@@ -1098,7 +1098,7 @@ mapswithme
 *tourism|chalet
 *tourism|information|board
 *tourism|information|map
-mapswithme
+*shop|paint
 *traffic_calming|bump
 *traffic_calming|hump
 *shop|car_parts
@@ -1109,8 +1109,8 @@ mapswithme
 *amenity|public_bookcase
 *tourism|apartment
 *tourism|resort
-mapswithme
-mapswithme
+*shop|interior_decoration
+*shop|houseware
 *hwtag|nobicycle
 *hwtag|yesbicycle
 *hwtag|bidir_bicycle
@@ -1153,8 +1153,8 @@ mapswithme
 *historic|fort
 *shop|coffee
 *shop|tea
-mapswithme
-mapswithme
+*shop|art
+*shop|charity
 *hwtag|toll
 *amenity|arts_centre
 *amenity|biergarten
@@ -1174,7 +1174,7 @@ mapswithme
 *leisure|fitness_station
 *leisure|ice_rink
 *leisure|marina
-mapswithme
+*shop|medical_supply
 *man_made|surveillance
 *man_made|water_tap
 *man_made|works
@@ -1182,7 +1182,7 @@ mapswithme
 *office|ngo
 *shop|chocolate
 *shop|erotic
-mapswithme
+*shop|kitchen
 *shop|fabric
 *shop|funeral_directors
 *shop|massage
@@ -1197,25 +1197,25 @@ mapswithme
 *shop|video
 *tourism|theme_park
 *tourism|wilderness_hut
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
+*shop|boutique
+*shop|lottery
+*shop|antiques
+*shop|wholesale
+*shop|perfumery
+*shop|baby_goods
+*shop|bag
+*shop|dairy
+*shop|electrical
+*shop|cheese
 *shop|money_lender
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
+*shop|health_food
+*shop|fishing
+*shop|grocery
+*shop|nutrition_supplements
+*shop|watches
+*shop|second_hand
+*shop|craft
+*shop|sewing
 mapswithme
 mapswithme
 mapswithme
diff --git a/data/visibility.txt b/data/visibility.txt
index ba304b0dfc..6743794b9d 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -853,12 +853,17 @@ world  00000000000000000000  +
         {}
     shop  00000000000000000000  +
         alcohol  00000000000000000000  -
+        antiques  00000000000000000000  -
+        art  00000000000000000000  -
+        baby_goods  00000000000000000000  -
+        bag  00000000000000000000  -
         bakery  00000000000000000000  -
         beauty  00000000000000000000  -
         beverages  00000000000000000000  -
         bicycle  00000000000000000000  -
         bookmaker  00000000000000000000  -
         books  00000000000000000000  -
+        boutique  00000000000000000000  -
         butcher  00000000000000000000  -
         car  00000000000000000111  -
         car_parts  00000000000000000111  -
@@ -866,6 +871,8 @@ world  00000000000000000000  +
             tyres  00000000000000011111  -
             {}
         caravan  00000000000000000111  -
+        charity  00000000000000000000  -
+        cheese  00000000000000000000  -
         chemist  00000000000000000000  -
         chocolate  00000000000000000000  -
         clothes  00000000000000000000  -
@@ -875,50 +882,74 @@ world  00000000000000000000  +
         convenience  00000000000000000000  -
         copyshop  00000000000000000000  -
         cosmetics  00000000000000000000  -
+        craft  00000000000000000000  -
+        dairy  00000000000000000000  -
+        deli  00000000000000000000  -
         department_store  00000000000000000000  -
         doityourself  00000000000000000000  -
         dry_cleaning  00000000000000000000  -
+        electrical  00000000000000000000  -
         electronics  00000000000000000000  -
         erotic  00000000000000000000  -
         fabric  00000000000000000000  -
+        farm  00000000000000000000  -
+        fishing  00000000000000000000  -
         florist  00000000000000000000  -
         funeral_directors  00000000000000000000  -
         furniture  00000000000000000000  -
         garden_centre  00000000000000000000  -
         gift  00000000000000000000  -
         greengrocer  00000000000000000000  -
+        grocery  00000000000000000000  -
         hairdresser  00000000000000000000  -
         hardware  00000000000000000000  -
+        health_food  00000000000000000000  -
+        houseware  00000000000000000000  -
+        interior_decoration  00000000000000000000  -
         jewelry  00000000000000000000  -
         kiosk  00000000000000000000  -
+        kitchen  00000000000000000000  -
         laundry  00000000000000000000  -
+        lottery  00000000000000000000  -
         mall  00000000000000111111  -
         massage  00000000000000000000  -
+        medical_supply  00000000000000000000  -
         mobile_phone  00000000000000000000  -
         money_lender  00000000000000000000  -
         motorcycle  00000000000000000111  -
         music  00000000000000000000  -
         musical_instrument  00000000000000000000  -
         newsagent  00000000000000000000  -
+        nutrition_supplements  00000000000000000000  -
         optician  00000000000000000000  -
         outdoor  00000000000000000000  -
+        paint  00000000000000000000  -
+        pastry  00000000000000000000  -
         pawnbroker  00000000000000000000  -
+        perfumery  00000000000000000000  -
         pet  00000000000000000000  -
         photo  00000000000000000000  -
         seafood  00000000000000000000  -
+        second_hand  00000000000000000000  -
+        sewing  00000000000000000000  -
         shoes  00000000000000000000  -
         sports  00000000000000000000  -
         stationery  00000000000000000000  -
+        storage_rental  00000000000000000000  -
         supermarket  00000000000000111111  -
         tattoo  00000000000000000000  -
         tea  00000000000000000000  -
         ticket  00000000000000000000  -
+        tobacco  00000000000000000000  -
         toys  00000000000000000000  -
+        trade  00000000000000000000  -
         travel_agency  00000000000000000000  -
         tyres  00000000000000000000  -
         variety_store  00000000000000000000  -
         video  00000000000000000000  -
         video_games  00000000000000000000  -
+        watches  00000000000000000000  -
+        wholesale  00000000000000000000  -
         wine  00000000000000000000  -
         {}
     sport  00000000000000000000  +