diff --git a/editions/tw5.com/tiddlers/messages/config-flickr-album.tid b/plugins/tiddlywiki/geospatial/demo/config/flickr-album.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/messages/config-flickr-album.tid
rename to plugins/tiddlywiki/geospatial/demo/config/flickr-album.tid
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-http-request Example Flickr.tid b/plugins/tiddlywiki/geospatial/demo/flickr.tid
similarity index 94%
rename from editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-http-request Example Flickr.tid
rename to plugins/tiddlywiki/geospatial/demo/flickr.tid
index 1e2ebef3e..2df176feb 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-http-request Example Flickr.tid	
+++ b/plugins/tiddlywiki/geospatial/demo/flickr.tid
@@ -1,5 +1,6 @@
-title: WidgetMessage: tm-http-request Example - Flickr
-tags: $:/tags/Macro
+title: $:/plugins/tiddlywiki/geospatial/demo/flickr
+caption: Flickr
+tags: $:/tags/Macro $:/tags/GeospatialDemo
 
 <!--
 Get items from a Flickr album/interestingness/collection etc.
@@ -87,7 +88,7 @@ https://api.flickr.com/services/rest/
 <$macrocall $name="flickr-get-album-items"/>
 \end
 
-! Map of Flickr Photos
+! Retrieve Geotagged Flickr Photos
 
 Flickr API Key: <$password name="flickr-api-key"/>
 
@@ -102,8 +103,3 @@ Get Flickr album
 <$macrocall $name="flickr-get-interesting-items"/>
 Get Flickr interesting items
 </$button>
-
-<$geomap
-	markers="[all[tiddlers+shadows]tag[$:/tags/GeoMarker]tag[$:/tags/FlickrPhoto]]"
-
-/>