diff --git a/public/potlatch2/map_features.xml b/public/potlatch2/map_features.xml
index 3df4673d6..ecf9f3314 100644
--- a/public/potlatch2/map_features.xml
+++ b/public/potlatch2/map_features.xml
@@ -99,7 +99,7 @@ Quick documentation:
   <category name="Advanced" id="advanced">
   </category>
 
-  <category name="Misc" id="misc">
+  <category name="Places" id="places">
   </category>
 
   <!-- Common input sets -->
@@ -537,6 +537,24 @@ Quick documentation:
 
   </inputSet>
 
+  <inputSet id="places">
+    <input type="choice" name="Type of Place" presence="always" key="place">
+      <choice value="locality" text="Locality"/>
+      <choice value="hamlet" text="Hamlet"/>
+      <choice value="village" text="Village"/>
+      <choice value="suburb" text="Suburb"/>
+      <choice value="town" text="Town"/>
+      <choice value="city" text="City"/>
+      <choice value="county" text="County"/>
+      <choice value="region" text="Region"/>
+      <choice value="state" text="State"/>
+      <choice value="country" text="Country"/>
+      <choice value="continent" text="Continent"/>
+      <choice value="island" text="Island"/>
+      <choice value="islet" text="Islet"/>
+    </input>
+  </inputSet>
+
   <!-- ************************************************************************
        Roads
        ************************************************************************ -->
@@ -1961,33 +1979,62 @@ Quick documentation:
   </inputSet>
 
   <!-- Places -->
-  <feature name="Place">
-    <category>misc</category>
+
+
+  <feature name="Hamlet">
+    <category>places</category>
     <icon image="icons/place.png"/>
     <point/>
     <area/>
-    <!-- TODO: make this work -->
-    <!-- <tag k="place" v="*"/>-->
+    <tag k="place" v="hamlet" />
     <inputSet ref="names"/>
-    <input type="choice" name="Type of place name" presence="always" key="place">
-      <choice value="locality" text="Locality"/>
-      <choice value="hamlet" text="Hamlet"/>
-      <choice value="village" text="Village"/>
-      <choice value="suburb" text="Suburb"/>
-      <choice value="county" text="County"/>
-      <choice value="city" text="City"/>
-      <choice value="region" text="Region"/>
-      <choice value="state" text="State"/>
-      <choice value="country" text="Country"/>
-      <choice value="continent" text="Continent"/>
-      <choice value="island" text="Island"/>
-      <choice value="islet" text="Islet"/>
-    </input>
+    <inputSet ref="places"/>
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Village">
+    <category>places</category>
+    <icon image="icons/place.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="village" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <inputSet ref="common"/>
+  </feature>
 
+  <feature name="Suburb">
+    <category>places</category>
+    <icon image="icons/place.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="suburb" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <inputSet ref="common"/>
+  </feature>
 
+  <feature name="Town">
+    <category>places</category>
+    <icon image="icons/place.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="town" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="City">
+    <category>places</category>
+    <icon image="icons/place.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="city" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <inputSet ref="common"/>
+  </feature>
 
   <!-- ************************************************************************
        POIs
@@ -2709,6 +2756,7 @@ Quick documentation:
     <point/>
     <!-- Warning: creates "traffic_calming=*" by default, but it's the best we can do. Steve Bennett-->
     <!--<tag k="traffic_calming" v="*"/>-->
+    <tag k="traffic_calming" v="yes"/>
     <input type="choice" key="traffic_calming" name="Obstacle type" category="Traffic calming" presence="onTagMatch">
       <choice value="yes" text="Unspecified"/>
       <choice value="bump" text="Short bump" description="A sharp speed bump, typically slowing cars to 15 kph or less."/>
diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf
index a53250f2b..b29b0caa5 100644
Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ