diff --git a/config/lines b/config/lines
index 1e82eb2..b842121 100644
--- a/config/lines
+++ b/config/lines
@@ -154,19 +154,19 @@ highway=* & amenity=fuel | amenity=fuel & area=yes
 highway=motorway 	{name '${name} (${ref)}' 
 	| '${name} (${route_ref})' 
 	| '${ref|highway-symbol:hbox}' 
-	| '${name}'; add display_name = '${name} (${ref})' }
+	| '${name}'; add mkgmap:display_name = '${name} (${ref})' }
 highway=trunk		{ name '${name} (${ref})' 
 	| '${name} (${route_ref})' 
 	| '${ref|highway-symbol:hbox}' 
-	| '${name}'; add display_name = '${name} (${ref})' }
+	| '${name}'; add mkgmap:display_name = '${name} (${ref})' }
 highway=primary		{ name '${name} (${ref})' 
 	| '${name} (${route_ref})' 
 	| '${ref|highway-symbol:box}' 
-	| '${name}'; add display_name = '${name} (${ref})' }
+	| '${name}'; add mkgmap:display_name = '${name} (${ref})' }
 highway=secondary 	{ name '${name} (${ref})' 
 	| '${name} (${route_ref})' 
 	| '${ref|highway-symbol:box}' 
-	| '${name}'; add display_name = '${name} (${ref})' }
+	| '${name}'; add mkgmap:display_name = '${name} (${ref})' }
 # highway=* 		{ name '${ref} ${name}' | '${ref}' | '${name}' }
 
 # дополнительный тип односторонних дорог со стрелками
@@ -219,12 +219,12 @@ highway=path & (horse=designated|horse=official) {set highway=bridleway }
 highway=path & (foot=designated|foot=official) {set highway=footway }
 
 # Roundabouts
-junction=roundabout & highway=trunk {add display_name = '${name}'} [0x0c road_class=3 road_speed=2 resolution 18]
-junction=roundabout & highway=primary {add display_name = '${name}'} [0x0c road_class=3 road_speed=2 resolution 19]
-junction=roundabout & highway=secondary {add display_name = '${name}'} [0x0c road_class=2 road_speed=2 resolution 19]
-junction=roundabout & highway=tertiary {add display_name = '${name}'} [0x0c road_class=1 road_speed=1 resolution 19]
-junction=roundabout & highway=unclassified {add display_name = '${name}'} [0x0c road_class=1 road_speed=1 resolution 19]
-junction=roundabout {add display_name = '${name}'} [0x0c road_class=0 road_speed=1 resolution 21]
+junction=roundabout & highway=trunk {add mkgmap:display_name = '${name}'} [0x0c road_class=3 road_speed=2 resolution 18]
+junction=roundabout & highway=primary {add mkgmap:display_name = '${name}'} [0x0c road_class=3 road_speed=2 resolution 19]
+junction=roundabout & highway=secondary {add mkgmap:display_name = '${name}'} [0x0c road_class=2 road_speed=2 resolution 19]
+junction=roundabout & highway=tertiary {add mkgmap:display_name = '${name}'} [0x0c road_class=1 road_speed=1 resolution 19]
+junction=roundabout & highway=unclassified {add mkgmap:display_name = '${name}'} [0x0c road_class=1 road_speed=1 resolution 19]
+junction=roundabout {add mkgmap:display_name = '${name}'} [0x0c road_class=0 road_speed=1 resolution 21]
 
 # Ways that may or may not be useable
 
@@ -245,35 +245,35 @@ mkgmap:unpaved=1 & highway=unclassified
 [0x13 road_class=1 road_speed=2 resolution 19]
 
 # Ways sorted roughly by descending order of class
-highway=motorway {add display_name = '${name}'; add oneway = yes; add bicycle = no; add foot = no } [0x01 road_class=4 road_speed=7 resolution 14]
+highway=motorway {add mkgmap:display_name = '${name}'; add oneway = yes; add bicycle = no; add foot = no } [0x01 road_class=4 road_speed=7 resolution 14]
 highway=motorway_link {add oneway = yes; add bicycle = no; add foot = no } [0x09 road_class=3 road_speed=2 resolution 19]
-highway=* & motorroad=yes {add display_name = '${name}'; add bicycle = no; add foot = no}  [0x02 road_class=4 road_speed=4 resolution 16]
-highway=trunk {add display_name = '${name}'} [0x02 road_class=4 road_speed=5 resolution 16]
+highway=* & motorroad=yes {add mkgmap:display_name = '${name}'; add bicycle = no; add foot = no}  [0x02 road_class=4 road_speed=4 resolution 16]
+highway=trunk {add mkgmap:display_name = '${name}'} [0x02 road_class=4 road_speed=5 resolution 16]
 highway=trunk_link [0x09 road_class=3 road_speed=2 resolution 21]
-highway=primary {add display_name = '${name}'} [0x03 road_class=3 road_speed=4 resolution 18]
+highway=primary {add mkgmap:display_name = '${name}'} [0x03 road_class=3 road_speed=4 resolution 18]
 highway=primary_link [0x08 road_class=3 road_speed=1 resolution 21]
-highway=secondary {add display_name = '${name}'} [0x04 road_class=2 road_speed=3 resolution 18]
+highway=secondary {add mkgmap:display_name = '${name}'} [0x04 road_class=2 road_speed=3 resolution 18]
 highway=secondary_link [0x08 road_class=2 road_speed=1 resolution 21]
-highway=tertiary {add display_name = '${name}'} [0x11 road_class=1 road_speed=3 resolution 19]
+highway=tertiary {add mkgmap:display_name = '${name}'} [0x11 road_class=1 road_speed=3 resolution 19]
 highway=tertiary_link [0x08 road_class=1 road_speed=1 resolution 21]
-highway=minor {add display_name = '${name}'} [0x06 road_class=1 road_speed=3 resolution 19]
-highway=unclassified {add display_name = '${name}'} [0x06 road_class=0 road_speed=3 resolution 19]
+highway=minor {add mkgmap:display_name = '${name}'} [0x06 road_class=1 road_speed=3 resolution 19]
+highway=unclassified {add mkgmap:display_name = '${name}'} [0x06 road_class=0 road_speed=3 resolution 19]
 
 highway=pedestrian & area!=yes {add access = no; add foot = yes} [0x16 road_class=0 road_speed=0 resolution 22]
 highway=living_street & area!=yes [0x06 road_class=0 road_speed=1 resolution 22]
-highway=residential & area!=yes {add display_name = '${name}'} [0x0d road_class=0 road_speed=2 resolution 22]
+highway=residential & area!=yes {add mkgmap:display_name = '${name}'} [0x0d road_class=0 road_speed=2 resolution 22]
 highway=bridleway {add access = no; add bicycle = yes; add foot = yes} [0x16 road_class=0 road_speed=0 resolution 22]
 highway=byway [0x16 road_class=0 road_speed=0 resolution 22]
-highway=service & oneway=yes {add display_name = '${name}'} [0x07 road_class=0 road_speed=1 resolution 22]
-highway=service {add display_name = '${name}'} [0x07 road_class=0 road_speed=1 resolution 24]
+highway=service & oneway=yes {add mkgmap:display_name = '${name}'} [0x07 road_class=0 road_speed=1 resolution 22]
+highway=service {add mkgmap:display_name = '${name}'} [0x07 road_class=0 road_speed=1 resolution 24]
 highway=cycleway {add access = no; add bicycle = yes; add foot = yes} [0x16 road_class=0 road_speed=1 resolution 22]
 highway=footway {add access = no; add foot = yes} [0x16 road_class=0 road_speed=0 resolution 22]
 highway=path {add access = no; add bicycle = yes; add foot = yes} [0x16 road_class=0 road_speed=0 resolution 22]
 highway=steps {add access = no; add foot = yes} [0x16 road_class=0 road_speed=0 resolution 22]
-highway=track & tracktype!=grade1 {add display_name = '${name}'} [0x0a road_class=0 road_speed=1 resolution 21]
-highway=track & tracktype=grade1 {add display_name = '${name}'} [0x07 road_class=1 road_speed=1 resolution 21]
-highway=unsurfaced {add display_name = '${name}'} [0x0a road_class=0 road_speed=1 resolution 21]
-highway=road {add display_name = '${name}'} [0x05 road_class=0 road_speed=1 resolution 21]
+highway=track & tracktype!=grade1 {add mkgmap:display_name = '${name}'} [0x0a road_class=0 road_speed=1 resolution 21]
+highway=track & tracktype=grade1 {add mkgmap:display_name = '${name}'} [0x07 road_class=1 road_speed=1 resolution 21]
+highway=unsurfaced {add mkgmap:display_name = '${name}'} [0x0a road_class=0 road_speed=1 resolution 21]
+highway=road {add mkgmap:display_name = '${name}'} [0x05 road_class=0 road_speed=1 resolution 21]
 # highway=road {add mkgmap:dead-end-check = false} [0x00 road_class=0 road_speed=1 resolution 21]
 
 # Mop up any unrecognised highway types
@@ -318,6 +318,7 @@ waterway=rapid | waterway=rapids | whitewater=rapid | whitewater=rapids
 
 waterway=drain [0x18 resolution 19 continue]
 waterway=stream [0x18 resolution 21 continue]
+waterway=ditch [0x18 resolution 21 continue]
 
 man_made=pipeline {name '${name}' | '${operator}'} [0x28 resolution 18]
 # Просеки
diff --git a/config/points b/config/points
index b6f2f99..4bdff48 100644
--- a/config/points
+++ b/config/points
@@ -132,7 +132,9 @@ amenity=community_centre [0x3005 resolution 24 default_name 'обществен
 amenity=community_center [0x3005 resolution 24 default_name 'общественный центр']
 amenity=courthouse [0x3004 resolution 24 default_name 'суд']
 amenity=doctors [0x3002 resolution 24 default_name 'поликлиника']
-amenity=drinking_water [0x5000 resolution 24 default_name 'вода']
+amenity=dentist [0x3002 resolution 24 default_name 'стоматология']
+amenity=clinic [0x3002 resolution 24 default_name 'клиника']
+amenity=drinking_water | man_made=water_well [0x5000 resolution 24 default_name 'вода']
 amenity=embassy & country=* { name '${country} ${name|def:}' } [0x3003 resolution 24 default_name 'посольство']
 amenity=embassy & country!=* [0x3003 resolution 24 default_name 'посольство']
 amenity=emergency_phone [0x2f12 resolution 21 default_name 'экстренный телефон']
@@ -250,9 +252,12 @@ highway=services { name '${ref} ${name}' | '${ref}' | '${name}' }
 highway=services [0x2f03 resolution 21 default_name 'служебн.']
 
 historic=museum [0x2c02 resolution 24 default_name 'музей']
+#historic=archaeological_site | historic=ruins [0x2c04 resolution 24 default_name 'историч.']
 historic=archaeological_site [0x2c04 resolution 24 default_name 'историч.']
 historic=memorial [0x2c04 resolution 24 default_name 'мемориал']
 historic=monument [0x2c04 resolution 24 default_name 'монумент']
+#historic=castle [0x2c04 resolution 24 default_name 'замок']
+#historic=fort [0x2c04 resolution 24 default_name 'форт']
 historic=fort [0x11604 resolution 21 default_name 'форт']
 historic=castle [0x11604 resolution 21 default_name 'замок']
 historic=ruins [0x11605 resolution 21 default_name 'историч.']
@@ -284,7 +289,7 @@ natural=cave_entrance [0x6601 resolution 21 default_name 'пещера']
 natural=cliff {name '${name|def:}${ele|height:m=>ft|def:}' } [0x6607 resolution 21 default_name 'утес']
 natural=glacier [0x650a resolution 21 default_name 'ледник']
 natural=rock {name '${name|def:}${ele|height:m=>ft|def:}' } [0x6614 resolution 21 default_name 'скала']
-natural=spring [0x6511 resolution 24 default_name 'родник']
+natural=spring [0x6511 resolution 22 default_name 'родник']
 natural=stream [0x6512 resolution 21 default_name 'ручей']
 natural=volcano {name '${name|def:}${ele|height:m=>ft|def:}' } [0x2c0c resolution 21 default_name 'вулкан']
 natural=water & name=* [0x650d resolution 21]
@@ -369,6 +374,7 @@ shop=bakers [0x2e02 resolution 24 default_name 'булочная']
 shop=bakery [0x2e02 resolution 24 default_name 'булочная']
 shop=beauty [0x2f10 resolution 24 default_name 'салон красоты']
 shop=bicycle [0x2f13 resolution 24 default_name 'велосипеды']
+shop=motorcycle [0x2f13 resolution 24 default_name 'мотоциклы']
 shop=boat [0x2f09 resolution 24 default_name 'лодки']
 shop=butcher [0x2e0c resolution 24 default_name 'мясо']
 
diff --git a/config/polygons b/config/polygons
index 01e9ed4..e1174ed 100644
--- a/config/polygons
+++ b/config/polygons
@@ -324,4 +324,4 @@ natural=cliff [0x10118 resolution 21]
 # boundary=administrative & admin_level=4 & name='Новгородская область' [0x4b resolution 16 continue]
 # boundary=administrative & admin_level=4 & name='Костромская область' [0x4b resolution 16 continue]
 # boundary=administrative & admin_level=4 & name='Вологодская область' [0x4b resolution 16 continue]
-boundary=administrative & admin_level=4 & name='Ярославская область' [0x4b resolution 16 continue]
\ No newline at end of file
+# boundary=administrative & admin_level=4 & name='Ярославская область' [0x4b resolution 16 continue]
\ No newline at end of file