Index: /trunk/presets/presets.xml
===================================================================
--- /trunk/presets/presets.xml	(revision 958)
+++ /trunk/presets/presets.xml	(revision 959)
@@ -745,5 +745,5 @@
 
 		<item name="Speed Camera" icon="presets/speed_camera.png">
-			<key key="amenity" value="speed_camera" />
+			<key key="highway" value="speed_camera" />
 		</item>
 		
@@ -1314,4 +1314,16 @@
 			<label text="Edit Battlefield" />
 			<key key="historic" value="battlefield" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
+		<item name="Wayside Cross" icon="presets/empty.png">
+			<label text="Edit a Wayside Cross" />
+			<key key="historic" value="wayside_cross" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
+		<item name="Wayside Shrine" icon="presets/empty.png">
+			<label text="Edit a Wayside Shrine" />
+			<key key="historic" value="wayside_shrine" />
 			<text key="name" text="Name" default="" delete_if_empty="true" />
 		</item>