Index: /trunk/presets/presets.xml
===================================================================
--- /trunk/presets/presets.xml	(revision 2607)
+++ /trunk/presets/presets.xml	(revision 2608)
@@ -1420,11 +1420,4 @@
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
         </item>
-        <item name="Shop" icon="presets/car_repair.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-            <label text="Edit Car Shop" />
-            <key key="shop" value="car" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-        </item>
         <item name="Repair" icon="presets/car_repair.png" type="node,closedway">
             <label text="Edit Car Repair" />
@@ -1462,11 +1455,4 @@
             <label text="Edit Bicycle Rental" />
             <key key="amenity" value="bicycle_rental" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Shop" icon="presets/bike.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-            <label text="Edit Bicycle Shop" />
-            <key key="shop" value="bicycle" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
@@ -2511,4 +2497,18 @@
     </group> <!-- Amenities -->
     <group name="Shops" icon="presets/shopping.png">
+        <item name="Car Dealer" icon="presets/car_repair.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+            <label text="Edit Car Shop" />
+            <key key="shop" value="car" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+        </item>
+        <item name="Bike Dealer" icon="presets/bike.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+            <label text="Edit Bicycle Shop" />
+            <key key="shop" value="bicycle" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
         <item name="Supermarket" icon="presets/shopping.png" type="node,closedway">
             <label text="Edit Supermarket" />