1267 changed files with 1568 additions and 1613 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1,7 @@
 tools/tagmaps/*.map
 tags/tagged-*.sources
 tags/tagged-*.en.xhtml
-*/generated_xml/*.xml
+generated_xml/
 d_day.en.xml
 d_month.en.xml
 d_year.en.xml
--- a/events/2010/event-20100303-02.en.xml
+++ b/events/2010/event-20100303-02.en.xml
@ -7,7 +7,7 @@
 	Starting Wednesday, March 3, the Gothenburg FSFE team is reviving its Fellowship group with monthly meetings. The meetings will take place in <a href="http://gnutiken.se/en/">Gnutiken</a> at 18:00, and are open to everyone.
    </body>
  <tags>
-    <tag>sw</tag>
+
  </tags>
  </event>
 </eventset>
--- a/events/2010/event-20100923-01.en.xml
+++ b/events/2010/event-20100923-01.en.xml
@ -7,7 +7,7 @@
      <p>At the Westminster eForum Seminar on September 23, FSFE's President Karsten Gerloff will deliver a keynote address on "Free Software in business and in government." More information can be found <a href="http://www.westminsterforumprojects.co.uk/forums/event.php?eid=131">here</a>.</p>
    </body>
  <tags>
-    <tag>gb</tag>
+    <tag>uk</tag>
  </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110224-01.el.xml
+++ b/events/2011/event-20110224-01.el.xml
@ -13,12 +13,12 @@
    <link>http://odfplugfest.co.uk/</link>
    <tags>
      <tag>front-page</tag>
-      <tag>gb</tag>
-      <tag>Open Document Format</tag>
-      <tag>ofe</tag>
-      <tag>oasis</tag>
+      <tag>uk</tag>
+      <tag>openstandards</tag>
+
+
      <tag>Open Standards</tag>
-      <tag>public-sector</tag>
+      <tag>publicadministration</tag>
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110224-01.en.xml
+++ b/events/2011/event-20110224-01.en.xml
@ -9,12 +9,9 @@
    <link>http://odfplugfest.co.uk/</link>
    <tags>
      <tag>front-page</tag>
-      <tag>gb</tag>
-      <tag>Open Document Format</tag>
-      <tag>ofe</tag>
-      <tag>oasis</tag>
-      <tag>Open Standards</tag>
-      <tag>public-sector</tag>
+      <tag>uk</tag>
+      <tag>openstandards</tag>
+      <tag>publicadministration</tag>
    </tags>
  </event>
-</eventset>
+</eventset>
--- a/events/2011/event-20110224-01.hr.xml
+++ b/events/2011/event-20110224-01.hr.xml
@ -9,12 +9,9 @@
    <link>http://odfplugfest.co.uk/</link>
    <tags>
      <tag>front-page</tag>
-      <tag>gb</tag>
-      <tag>Open Document Format</tag>
-      <tag>ofe</tag>
-      <tag>oasis</tag>
-      <tag>Open Standards</tag>
-      <tag>public-sector</tag>
+      <tag>uk</tag>
+      <tag>openstandards</tag>
+      <tag>publicadministration</tag>
    </tags>
  </event>
-</eventset>
+</eventset>
--- a/events/2011/event-20110226-01.el.xml
+++ b/events/2011/event-20110226-01.el.xml
@ -14,7 +14,7 @@
    <link>http://pirateconference.eventbrite.com/</link>
    <tags>
      <tag>front-page</tag>
-      <tag>gb</tag>
+      <tag>uk</tag>
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110226-01.en.xml
+++ b/events/2011/event-20110226-01.en.xml
@ -13,7 +13,7 @@
    <link>http://pirateconference.eventbrite.com/</link>
    <tags>
      <tag>front-page</tag>
-      <tag>gb</tag>
+      <tag>uk</tag>
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110226-01.hr.xml
+++ b/events/2011/event-20110226-01.hr.xml
@ -13,7 +13,7 @@
    <link>http://pirateconference.eventbrite.com/</link>
    <tags>
      <tag>front-page</tag>
-      <tag>gb</tag>
+      <tag>uk</tag>
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110301-01.de.xml
+++ b/events/2011/event-20110301-01.de.xml
@ -16,11 +16,10 @@
      </ul>
    </body>
    <tags>
-      <tag>gb</tag>
+      <tag>uk</tag>
      <tag>fsf</tag>
      <tag>rms</tag>
-      <tag>talks</tag>
-      <tag>iet</tag>
+      <tag>talk</tag>
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110301-01.el.xml
+++ b/events/2011/event-20110301-01.el.xml
@ -19,11 +19,10 @@
      </ul>
    </body>
    <tags>
-      <tag>gb</tag>
+      <tag>uk</tag>
      <tag>fsf</tag>
      <tag>rms</tag>
-      <tag>talks</tag>
-      <tag>iet</tag>
+      <tag>talk</tag>
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110301-01.en.xml
+++ b/events/2011/event-20110301-01.en.xml
@ -17,11 +17,10 @@
      </ul>
    </body>
    <tags>
-      <tag>gb</tag>
+      <tag>uk</tag>
      <tag>fsf</tag>
      <tag>rms</tag>
-      <tag>talks</tag>
-      <tag>iet</tag>
+      <tag>talk</tag>
    </tags>
  </event>
-</eventset>
+</eventset>
--- a/events/2011/event-20110301-01.hr.xml
+++ b/events/2011/event-20110301-01.hr.xml
@ -16,11 +16,10 @@
      </ul>
    </body>
    <tags>
-      <tag>gb</tag>
+      <tag>uk</tag>
      <tag>fsf</tag>
      <tag>rms</tag>
-      <tag>talks</tag>
-      <tag>iet</tag>
+      <tag>talk</tag>
    </tags>
  </event>
-</eventset>
+</eventset>
--- a/events/2011/event-20110303-01.el.xml
+++ b/events/2011/event-20110303-01.el.xml
@ -11,7 +11,7 @@
    </body>
    <tags>
      <tag>front-page</tag>
-      <tag>cebit</tag>
+
      <tag>talk</tag>
    </tags>
  </event>
--- a/events/2011/event-20110303-01.en.xml
+++ b/events/2011/event-20110303-01.en.xml
@ -11,7 +11,7 @@
    </body>
    <tags>
      <tag>front-page</tag>
-      <tag>cebit</tag>
+
      <tag>de</tag>
      <tag>talk</tag>
    </tags>
--- a/events/2011/event-20110303-01.fr.xml
+++ b/events/2011/event-20110303-01.fr.xml
@ -12,7 +12,7 @@
    </body>
    <tags>
      <tag>front-page</tag>
-      <tag>cebit</tag>
+
      <tag>talk</tag>
    </tags>
  </event>
--- a/events/2011/event-20110303-01.hr.xml
+++ b/events/2011/event-20110303-01.hr.xml
@ -11,7 +11,7 @@
    </body>
    <tags>
      <tag>front-page</tag>
-      <tag>cebit</tag>
+
      <tag>talk</tag>
    </tags>
  </event>
--- a/events/2011/event-20110330-01.cs.xml
+++ b/events/2011/event-20110330-01.cs.xml
@ -15,7 +15,7 @@
      <tag>front-page</tag>
      <tag>dfd</tag>
      <tag>Open Standards</tag>
-      <tag>Open Document Format</tag>
+      <tag>openstandards</tag>
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110330-01.el.xml
+++ b/events/2011/event-20110330-01.el.xml
@ -17,7 +17,7 @@
      <tag>front-page</tag>
      <tag>dfd</tag>
      <tag>Open Standards</tag>
-      <tag>Open Document Format</tag>
+      <tag>openstandards</tag>
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110330-01.en.xml
+++ b/events/2011/event-20110330-01.en.xml
@ -15,7 +15,7 @@
      <tag>front-page</tag>
      <tag>dfd</tag>
      <tag>Open Standards</tag>
-      <tag>Open Document Format</tag>
+      <tag>openstandards</tag>
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110330-01.fr.xml
+++ b/events/2011/event-20110330-01.fr.xml
@ -15,7 +15,7 @@
      <tag>front-page</tag>
      <tag>dfd</tag>
      <tag>Open Standards</tag>
-      <tag>Open Document Format</tag>
+      <tag>openstandards</tag>
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110330-01.hr.xml
+++ b/events/2011/event-20110330-01.hr.xml
@ -13,7 +13,7 @@
      <tag>front-page</tag>
      <tag>dfd</tag>
      <tag>Open Standards</tag>
-      <tag>Open Document Format</tag>
+      <tag>openstandards</tag>
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110330-03.en.xml
+++ b/events/2011/event-20110330-03.en.xml
@ -8,7 +8,7 @@
    </body>
    <tags>
      <tag>dfd</tag>
-      <tag>gb</tag>
+      <tag>uk</tag>
      <tag>sam-tuke</tag>
    </tags>
  </event>
--- a/events/2011/event-20110331-01.de.xml
+++ b/events/2011/event-20110331-01.de.xml
@ -20,8 +20,8 @@
    <link>http://www.tsb-berlin.de/opensource</link>
    <tags>
      <tag>front-page</tag>
-      <tag>money</tag>
-      <tag>tsb</tag>
+
+
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110331-01.el.xml
+++ b/events/2011/event-20110331-01.el.xml
@ -21,8 +21,8 @@
    <link>http://www.tsb-berlin.de/opensource</link>
    <tags>
      <tag>front-page</tag>
-      <tag>money</tag>
-      <tag>tsb</tag>
+
+
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110331-01.en.xml
+++ b/events/2011/event-20110331-01.en.xml
@ -20,8 +20,8 @@
    <link>http://www.tsb-berlin.de/opensource</link>
    <tags>
      <tag>front-page</tag>
-      <tag>money</tag>
-      <tag>tsb</tag>
+
+
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110407-01.en.xml
+++ b/events/2011/event-20110407-01.en.xml
@ -11,8 +11,8 @@
    <tags>
      <tag>front-page</tag>
      <tag>fellowship</tag>
-      <tag>gb</tag>
-      <tag>manchester</tag>
+      <tag>uk</tag>
+
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110521-01.en.xml
+++ b/events/2011/event-20110521-01.en.xml
@ -9,7 +9,7 @@
    <link>http://www.ukuug.org/events/opentech2011/</link>
    <tags>
      <tag>front-page</tag>
-      <tag>gb</tag>
+      <tag>uk</tag>
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110526-01.en.xml
+++ b/events/2011/event-20110526-01.en.xml
@ -8,7 +8,7 @@
    </body>
    <link>http://madlab.org.uk/content/fsfe-2</link>
    <tags>
-	<tag>gb</tag>
+	<tag>uk</tag>
 	<tag>front-page</tag>
    </tags>
  </event>
--- a/events/2011/event-20110526-01.hr.xml
+++ b/events/2011/event-20110526-01.hr.xml
@ -8,7 +8,7 @@
    </body>
    <link>http://madlab.org.uk/content/fsfe-2</link>
    <tags>
-	<tag>uk</tag>
+	<tag>gb</tag>
 	<tag>front-page</tag>
    </tags>
  </event>
--- a/events/2011/event-20110609-01.en.xml
+++ b/events/2011/event-20110609-01.en.xml
@ -22,7 +22,7 @@
    <tags>
      <tag>front-page</tag>
      <tag>de</tag>
-      <tag>berlin</tag>
+
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110609-01.hr.xml
+++ b/events/2011/event-20110609-01.hr.xml
@ -22,7 +22,7 @@
    <tags>
      <tag>front-page</tag>
      <tag>de</tag>
-      <tag>berlin</tag>
+
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110611-01.en.xml
+++ b/events/2011/event-20110611-01.en.xml
@ -23,8 +23,8 @@
    <link>http://www.kiberpipa.org</link>
    <tags>
      <tag>front-page</tag>
-      <tag>si</tag>
-      <tag>party</tag>
+
+
      <tag>eu</tag>
    </tags>
  </event>
--- a/events/2011/event-20110611-01.hr.xml
+++ b/events/2011/event-20110611-01.hr.xml
@ -23,8 +23,8 @@
    <link>http://www.kiberpipa.org</link>
    <tags>
      <tag>front-page</tag>
-      <tag>si</tag>
-      <tag>party</tag>
+
+
      <tag>eu</tag>
    </tags>
  </event>
--- a/events/2011/event-20110614-01.en.xml
+++ b/events/2011/event-20110614-01.en.xml
@ -8,8 +8,8 @@
    </body>
    <link>http://www.smartgovlive.com/</link>
    <tags>
-      <tag>gb</tag>
-      <tag>public-sector</tag>
+      <tag>uk</tag>
+      <tag>publicadministration</tag>
    </tags>
  </event>
-</eventset>
+</eventset>
--- a/events/2011/event-20110629-01.en.xml
+++ b/events/2011/event-20110629-01.en.xml
@ -12,7 +12,7 @@
    <link>http://okcon.org/2011/programme</link>
    <tags>
      <tag>front-page</tag>
-      <tag>okcon</tag>
+
      <tag>de</tag>
    </tags>
  </event>
--- a/events/2011/event-20110630-01.en.xml
+++ b/events/2011/event-20110630-01.en.xml
@ -8,7 +8,7 @@
    </body>
    <link>http://madlab.org.uk/content/fsfe-4</link>
    <tags>
-	<tag>gb</tag>
+	<tag>uk</tag>
 	<tag>front-page</tag>
    </tags>
  </event>
--- a/events/2011/event-20110701-01.en.xml
+++ b/events/2011/event-20110701-01.en.xml
@ -20,8 +20,8 @@
    <link>http://softwarelivre.org/fisl12</link>
    <tags>
      <tag>front-page</tag>
-      <tag>fisl</tag>
-      <tag>br</tag>
+
+
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110722-01.de.xml
+++ b/events/2011/event-20110722-01.de.xml
@ -18,8 +18,8 @@
    <tags>
 	    <tag>front-page</tag>
 	    <tag>es</tag>
-	    <tag>galicia</tag>
-	    <tag>basque</tag>
+
+
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110722-01.en.xml
+++ b/events/2011/event-20110722-01.en.xml
@ -16,8 +16,8 @@
    <tags>
 	    <tag>front-page</tag>
 	    <tag>es</tag>
-	    <tag>galicia</tag>
-	    <tag>basque</tag>
+
+
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110722-01.es.xml
+++ b/events/2011/event-20110722-01.es.xml
@ -17,8 +17,8 @@
    <tags>
 	    <tag>front-page</tag>
 	    <tag>es</tag>
-	    <tag>galicia</tag>
-	    <tag>basque</tag>
+
+
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110722-01.eu.xml
+++ b/events/2011/event-20110722-01.eu.xml
@ -18,8 +18,8 @@
    <tags>
 	    <tag>front-page</tag>
 	    <tag>es</tag>
-	    <tag>galicia</tag>
-	    <tag>basque</tag>
+
+
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110728-01.en.xml
+++ b/events/2011/event-20110728-01.en.xml
@ -8,7 +8,7 @@
    </body>
    <link>http://madlab.org.uk/content/fsfe-5</link>
    <tags>
-	<tag>gb</tag>
+	<tag>uk</tag>
 	<tag>front-page</tag>
    </tags>
  </event>
--- a/events/2011/event-20110808-01.en.xml
+++ b/events/2011/event-20110808-01.en.xml
@ -19,7 +19,7 @@
    <link>https://www.desktopsummit.org/program</link>
    <tags>
      <tag>front-page</tag>
-      <tag>public-sector</tag>
+      <tag>publicadministration</tag>
      <tag>europe</tag>
    </tags>
  </event>
--- a/events/2011/event-20110808-01.hr.xml
+++ b/events/2011/event-20110808-01.hr.xml
@ -26,8 +26,7 @@
    <link>https://www.desktopsummit.org/program/sessions/free-desktops-europes-public-sector</link>
    <tags>
      <tag>front-page</tag>
-      <tag>public-sector</tag>
-      <tag>europe</tag>
+      <tag>publicadministration</tag>
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110813-01.en.xml
+++ b/events/2011/event-20110813-01.en.xml
@ -9,8 +9,8 @@
    <link>http://madlab.org.uk/content/stamp-out-the-ads-free-software-pdf-reader-sprint/</link>
    <tags>
      <tag>front-page</tag>
-      <tag>gb</tag>
-      <tag>madlab</tag>
+      <tag>uk</tag>
+
      <tag>pdfreaders</tag>
    </tags>
  </event>
--- a/events/2011/event-20110814-01.en.xml
+++ b/events/2011/event-20110814-01.en.xml
@ -10,9 +10,9 @@
    <link>http://oggcamp.org/</link>
    <tags>
      <tag>front-page</tag>
-      <tag>gb</tag>
+      <tag>uk</tag>
      <tag>unconference</tag>
-      <tag>booth</tag>
+      <tag>infobooth</tag>
    </tags>
  </event>
-</eventset>
+</eventset>
--- a/events/2011/event-20110825-01.en.xml
+++ b/events/2011/event-20110825-01.en.xml
@ -8,10 +8,10 @@
    </body>
    <link>http://www.cs.bham.ac.uk/sys/news/content/2011/08/10/richard-stallman-public-lecture/</link>
    <tags>
-	<tag>gb</tag>
+	<tag>uk</tag>
 	<tag>front-page</tag>
 	<tag>rms</tag>
-	<tag>birmingham</tag>
+
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110831-01.de.xml
+++ b/events/2011/event-20110831-01.de.xml
@ -11,7 +11,7 @@
             <tag>front-page</tag>
             <tag>de</tag>
             <tag>fellowship</tag>
-             <tag>duesseldorf</tag>
+
            </tags>
   </event>
 </eventset>
--- a/events/2011/event-20110831-01.en.xml
+++ b/events/2011/event-20110831-01.en.xml
@ -13,7 +13,7 @@
             <tag>front-page</tag>
             <tag>de</tag>
             <tag>fellowship</tag>
-             <tag>duesseldorf</tag>
+
            </tags>
   </event>
 </eventset>
--- a/events/2011/event-20110903.en.xml
+++ b/events/2011/event-20110903.en.xml
@ -20,11 +20,11 @@
      </p>
    </body>
 <tags>
-	<tag>gb</tag>
+	<tag>uk</tag>
 	<tag>front-page</tag>
 	<tag>Braderie</tag>
-	<tag>meeting</tag>
-	<tag>openstreetmap</tag>
+
+
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110904-01.en.xml
+++ b/events/2011/event-20110904-01.en.xml
@ -8,11 +8,11 @@
    </body>
    <link>http://diyfeminism.com/events-andworkshops/</link>
    <tags>
-	<tag>gb</tag>
+	<tag>uk</tag>
 	<tag>front-page</tag>
-	<tag>manchester</tag>
-	<tag>feminism</tag>
-	<tag>openstreetmap</tag>
+
+
+
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110909-01.en.xml
+++ b/events/2011/event-20110909-01.en.xml
@ -17,8 +17,7 @@
    <link>http://www.mastersoftwarelibre.com/2011/08/05/jornadas-abiertas-de-septiembre-2011/</link>
    <tags>
      <tag>front-page</tag>
-      <tag>public-sector</tag>
-      <tag>europe</tag>
+      <tag>publicadministration</tag>
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110914-01.en.xml
+++ b/events/2011/event-20110914-01.en.xml
@ -8,11 +8,10 @@
    </body>
    <link>https://dpcrosspartygroup.wordpress.com/</link>
    <tags>
-	<tag>gb</tag>
-	<tag>scotland</tag>
+	<tag>uk</tag>
 	<tag>front-page</tag>
 	<tag>Policy</tag>
-	<tag>mep</tag>
+
    </tags>
  </event>
-</eventset>
+</eventset>
--- a/events/2011/event-20110917-01.en.xml
+++ b/events/2011/event-20110917-01.en.xml
@ -14,7 +14,7 @@
    <tags>
      <tag>front-page</tag>
      <tag>sfd</tag>
-      <tag>gb</tag>
+      <tag>uk</tag>
      <tag>it</tag>
      <tag>de</tag>
      <tag>fi</tag>
--- a/events/2011/event-20110917-02.en.xml
+++ b/events/2011/event-20110917-02.en.xml
@ -9,7 +9,7 @@
    <tags>
      <tag>front-page</tag>
      <tag>sfd</tag>
-      <tag>gb</tag>
+      <tag>uk</tag>
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20110920-01.en.xml
+++ b/events/2011/event-20110920-01.en.xml
@ -8,9 +8,9 @@
    </body>
    <link>http://madlab.org.uk/content/manchester-free-software-14</link>
    <tags>
-	<tag>gb</tag>
+	<tag>uk</tag>
 	<tag>front-page</tag>
-	<tag>manchester</tag>
+
 	<tag>freedom-box</tag>
 	<tag>manchester-free-software</tag>
    </tags>
--- a/events/2011/event-20110929-01.en.xml
+++ b/events/2011/event-20110929-01.en.xml
@ -8,7 +8,7 @@
    </body>
    <link>http://madlab.org.uk/content/fsfe-6</link>
    <tags>
-	<tag>gb</tag>
+	<tag>uk</tag>
 	<tag>front-page</tag>
 	<tag>open-source-consortium</tag>
    </tags>
--- a/events/2011/event-20111004-01.en.xml
+++ b/events/2011/event-20111004-01.en.xml
@ -12,7 +12,7 @@ At the EuropeanaTech in Vienna, a conference about exploring the technical chall
    <tags>
 	<tag>at</tag>
 	<tag>Vienna</tag>
-	<tag>conference</tag>
+
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20111008-01.en.xml
+++ b/events/2011/event-20111008-01.en.xml
@ -8,10 +8,10 @@
    </body>
    <link>http://www.flossuk.org/Events/Unconference2011</link>
    <tags>
-	<tag>gb</tag>
+	<tag>uk</tag>
 	<tag>floss-uk</tag>
-	<tag>manchester</tag>
-	<tag>unconference</tag>
+
+
 	<tag>front-page</tag>
    </tags>
  </event>
--- a/events/2011/event-20111017-01.en.xml
+++ b/events/2011/event-20111017-01.en.xml
@ -7,11 +7,11 @@
        </body>
        <link>http://www.bcs.org/content/conEvent/6412</link>
        <tags>
-             <tag>gb</tag>
+             <tag>uk</tag>
             <tag>open-hardware</tag>
-             <tag>opencores</tag>
-             <tag>bcs</tag>
-	     <tag>london</tag>
+
+
+
        </tags>
   </event>
 </eventset>
--- a/events/2011/event-20111020-01.en.xml
+++ b/events/2011/event-20111020-01.en.xml
@ -8,10 +8,10 @@
    </body>
    <link>http://www.meetup.com/Contact/London-GB/88323/</link>
    <tags>
-	<tag>gb</tag>
-	<tag>contactcon</tag>
-	<tag>london</tag>
-	<tag>p2p</tag>
+	<tag>uk</tag>
+
+
+
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20111031-01.en.xml
+++ b/events/2011/event-20111031-01.en.xml
@ -9,9 +9,9 @@
        <tags>
             <tag>front-page</tag>
             <tag>RMS</tag>
-             <tag>gb</tag>
+             <tag>uk</tag>
             <tag>Aberystwyth</tag>
-             <tag>swpat</tag>
+             <tag>swpatents</tag>
        </tags>
   </event>
 </eventset>
--- a/events/2011/event-20111124-01.en.xml
+++ b/events/2011/event-20111124-01.en.xml
@ -8,9 +8,9 @@
        <link>http://madlab.org.uk/content/fsfe-7</link>
        <tags>
             <tag>front-page</tag>
-             <tag>gb</tag>
+             <tag>uk</tag>
             <tag>fellowship</tag>
-             <tag>manchester</tag>
+
        </tags>
   </event>
 </eventset>
--- a/events/2011/event-20111207-01.de.xml
+++ b/events/2011/event-20111207-01.de.xml
@ -14,7 +14,7 @@
    <tags>
      <tag>front-page</tag>
      <tag>ch</tag>
-      <tag>zurich</tag>
+
    </tags>
  </event>
 </eventset>
--- a/events/2011/event-20111207-01.en.xml
+++ b/events/2011/event-20111207-01.en.xml
@ -13,7 +13,7 @@
    <tags>
      <tag>front-page</tag>
      <tag>ch</tag>
-      <tag>zurich</tag>
+
    </tags>
  </event>
 </eventset>
--- a/events/2012/event-20120317-01.en.xml
+++ b/events/2012/event-20120317-01.en.xml
@ -18,7 +18,7 @@
    <tags>
      <tag>front-page</tag>
      <tag>de</tag>
-      <tag>clt2012</tag>
+      <tag>clt</tag>
    </tags>
  </event>
 </eventset>
--- a/events/2012/event-20120322.en.xml
+++ b/events/2012/event-20120322.en.xml
@ -7,11 +7,11 @@
        </body>
        <tags>
             <tag>front-page</tag>
-             <tag>gb</tag>
+             <tag>uk</tag>
             <tag>fellowship</tag>
-             <tag>manchester</tag>
-	     <tag>mailpod</tag>
-		<tag>arcspace</tag>
+
+
+
        </tags>
   </event>
 </eventset>
--- a/events/2012/event-20120324.en.xml
+++ b/events/2012/event-20120324.en.xml
@ -9,10 +9,8 @@
    <link>http://www.openrightsgroup.org/orgcon-2012</link>
    <tags>
      <tag>front-page</tag>
-      <tag>gb</tag>
-      <tag>london</tag>
-      <tag>openrightsgroup</tag>
-      <tag>booth</tag>
+      <tag>uk</tag>
+      <tag>infobooth</tag>
    </tags>
  </event>
 </eventset>
--- a/events/2012/event-20120328-01.el.xml
+++ b/events/2012/event-20120328-01.el.xml
@ -20,7 +20,7 @@
      <tag>front-page</tag>
      <tag>dfd</tag>
      <tag>Open Standards</tag>
-      <tag>Open Document Format</tag>
+      <tag>openstandards</tag>
    </tags>
  </event>
 </eventset>
--- a/events/2012/event-20120328-01.en.xml
+++ b/events/2012/event-20120328-01.en.xml
@ -14,7 +14,7 @@
      <tag>front-page</tag>
      <tag>dfd</tag>
      <tag>Open Standards</tag>
-      <tag>Open Document Format</tag>
+      <tag>openstandards</tag>
    </tags>
  </event>
 </eventset>
--- a/events/2012/event-20120329.en.xml
+++ b/events/2012/event-20120329.en.xml
@ -8,10 +8,10 @@
 	<link>http://madlab.org.uk/content/free-software-foundation-europe-4/</link>
        <tags>
             <tag>front-page</tag>
-             <tag>gb</tag>
+             <tag>uk</tag>
             <tag>fellowship</tag>
-             <tag>manchester</tag>
-	     <tag>jack</tag>
+
+
        </tags>
   </event>
 </eventset>
--- a/events/2012/event-20120331.el.xml
+++ b/events/2012/event-20120331.el.xml
@ -16,10 +16,8 @@
    <!--<link>https://wiki.fsfe.org/FellowshipEvents/Fellowship%20meeting%20in%20Berlin%20-%20September</link>-->
    <tags>
      <tag>front-page</tag>
-      <tag>gb</tag>
-      <tag>leicester</tag>
-      <tag>manchester</tag>
-      <tag>booth</tag>
+      <tag>uk</tag>
+      <tag>infobooth</tag>
    </tags>
  </event>
 </eventset>
--- a/events/2012/event-20120331.en.xml
+++ b/events/2012/event-20120331.en.xml
@ -9,10 +9,8 @@
    <!--<link>https://wiki.fsfe.org/FellowshipEvents/Fellowship%20meeting%20in%20Berlin%20-%20September</link>-->
    <tags>
      <tag>front-page</tag>
-      <tag>gb</tag>
-      <tag>leicester</tag>
-      <tag>manchester</tag>
-      <tag>booth</tag>
+      <tag>uk</tag>
+      <tag>infobooth</tag>
    </tags>
  </event>
 </eventset>
--- a/events/2012/event-20120404-01.el.xml
+++ b/events/2012/event-20120404-01.el.xml
@ -14,11 +14,11 @@
    <link>http://ossg.bcs.org/2012/02/25/looking-into-the-future-of-hmg-desktopclient-side-computing/</link>
    <tags>
      <tag>front-page</tag>
-      <tag>gb</tag>
-      <tag>bcs</tag>
+      <tag>uk</tag>
+
      <tag>procurement</tag>
-      <tag>london</tag>
-      <tag>tuke</tag>
+
+
    </tags>
  </event>
 </eventset>
--- a/events/2012/event-20120404-01.en.xml
+++ b/events/2012/event-20120404-01.en.xml
@ -9,11 +9,11 @@
    <link>http://ossg.bcs.org/2012/02/25/looking-into-the-future-of-hmg-desktopclient-side-computing/</link>
    <tags>
      <tag>front-page</tag>
-      <tag>gb</tag>
-      <tag>bcs</tag>
+      <tag>uk</tag>
+
      <tag>procurement</tag>
-      <tag>london</tag>
-      <tag>tuke</tag>
+
+
    </tags>
  </event>
 </eventset>
--- a/events/2012/event-20120421-01.el.xml
+++ b/events/2012/event-20120421-01.el.xml
@ -21,9 +21,9 @@

    <tags>
      <tag>front-page</tag>
-      <tag>gb</tag>
-      <tag>manchester</tag>
-      <tag>web</tag>
+      <tag>uk</tag>
+
+
      <tag>web sprint</tag>
    </tags>
  </event>
--- a/events/2012/event-20120421-01.en.xml
+++ b/events/2012/event-20120421-01.en.xml
@ -21,9 +21,9 @@

    <tags>
      <tag>front-page</tag>
-      <tag>gb</tag>
-      <tag>manchester</tag>
-      <tag>web</tag>
+      <tag>uk</tag>
+
+
      <tag>web sprint</tag>
    </tags>
  </event>
--- a/events/2012/event-20120426.en.xml
+++ b/events/2012/event-20120426.en.xml
@ -8,9 +8,9 @@
 	<link>http://madlab.org.uk/content/free-software-foundation-europe-3/</link>
        <tags>
             <tag>front-page</tag>
-             <tag>gb</tag>
+             <tag>uk</tag>
             <tag>fellowship</tag>
-             <tag>manchester</tag>
+
        </tags>
   </event>
 </eventset>
--- a/events/2012/event-20120428-01.en.xml
+++ b/events/2012/event-20120428-01.en.xml
@ -25,7 +25,7 @@
    <link>https://ansol.org/fsfega2012meetup</link>
    <tags>
      <tag>front-page</tag>
-      <tag>en</tag>
+
      <tag>pt</tag>
    </tags>
  </event>
--- a/events/2012/event-20120522-01.de.xml
+++ b/events/2012/event-20120522-01.de.xml
@ -11,7 +11,7 @@
    <link>http://www.berliner-wissenswerte.de/termine/detail/788</link>
    <tags>
      <tag>front-page</tag>
-      <tag>lecture</tag>
+
      <tag>de</tag>
    </tags>
  </event>
--- a/events/2012/event-20120522-01.el.xml
+++ b/events/2012/event-20120522-01.el.xml
@ -17,7 +17,7 @@ Treffpunkt WissenWerte στο Amerika-Haus στο Βερολίνο. Η συμμ
    <link>http://www.berliner-wissenswerte.de/termine/detail/788</link>
    <tags>
      <tag>front-page</tag>
-      <tag>lecture</tag>
+
      <tag>de</tag>
    </tags>
  </event>
--- a/events/2012/event-20120522-01.en.xml
+++ b/events/2012/event-20120522-01.en.xml
@ -11,7 +11,7 @@
    <link>http://www.berliner-wissenswerte.de/termine/detail/788</link>
    <tags>
      <tag>front-page</tag>
-      <tag>lecture</tag>
+
      <tag>de</tag>
    </tags>
  </event>
--- a/events/2012/event-20120526-01.de.xml
+++ b/events/2012/event-20120526-01.de.xml
@ -13,7 +13,7 @@
    <tags>
 	<tag>edu</tag>
      <tag>front-page</tag>
-      <tag>lecture</tag>
+
      <tag>de</tag>
    </tags>
  </event>
--- a/events/2012/event-20120526-01.el.xml
+++ b/events/2012/event-20120526-01.el.xml
@ -20,7 +20,7 @@
    <tags>
 	<tag>edu</tag>
      <tag>front-page</tag>
-      <tag>lecture</tag>
+
      <tag>de</tag>
    </tags>
  </event>
--- a/events/2012/event-20120526-01.en.xml
+++ b/events/2012/event-20120526-01.en.xml
@ -13,7 +13,7 @@
    <tags>
 	<tag>edu</tag>
      <tag>front-page</tag>
-      <tag>lecture</tag>
+
      <tag>de</tag>
    </tags>
  </event>
--- a/events/2012/event-20120529-01.el.xml
+++ b/events/2012/event-20120529-01.el.xml
@ -12,10 +12,9 @@
   <link>http://openstandardsroundtable5.eventbrite.co.uk/</link>
   <tags>
    <tag>front-page</tag>
-    <tag>gb</tag>
+    <tag>uk</tag>
    <tag>open-standards</tag>
-    <tag>manchester</tag>
-    <tag>public-sector</tag>    
+    <tag>publicadministration</tag>    
    <tag>Policy</tag>
   </tags>
  </event>
--- a/events/2012/event-20120529-01.en.xml
+++ b/events/2012/event-20120529-01.en.xml
@ -7,11 +7,10 @@
   <link>http://openstandardsroundtable5.eventbrite.co.uk/</link>
   <tags>
    <tag>front-page</tag>
-    <tag>gb</tag>
+    <tag>uk</tag>
    <tag>open-standards</tag>
-    <tag>manchester</tag>
-    <tag>public-sector</tag>    
+    <tag>publicadministration</tag>