diff --git a/Rules b/Rules
index acaa349..7aa7550 100644
--- a/Rules
+++ b/Rules
@@ -25,6 +25,8 @@ preprocess do
   ignore_old_content('blog', 'events', 'about/verslagen') if development?
 
   update_blog_attributes
+  convert_tags('Blog')
+  convert_tags('Events')
   create_yearly_items('Blog')
   create_yearly_items('Events')
   create_tagly_items('Blog')
diff --git a/lib/helpers/events.rb b/lib/helpers/events.rb
index 14aadf4..7300609 100644
--- a/lib/helpers/events.rb
+++ b/lib/helpers/events.rb
@@ -24,7 +24,7 @@ module EventsHelper
 
   def all_events_by_tag(tag = nil, soon = nil)
     @items.find_all('/events/*/*.md')
-      .filter{|i| (i[:tags] || []).include? tag }
+      .filter { |i| (i[:tags] || []).include? tag }
       .select { |x| x[:soon] == soon }
       .sort_by { |x| x[:time] }
   end
diff --git a/lib/helpers/preprocess.rb b/lib/helpers/preprocess.rb
index 6c787de..510a2d0 100644
--- a/lib/helpers/preprocess.rb
+++ b/lib/helpers/preprocess.rb
@@ -120,6 +120,16 @@ module PreprocessHelper
     end
   end
 
+  def convert_tags(type)
+    type = type.to_s
+    @items.find_all("/#{type.downcase}/*/*").each do |item|
+      if item.key?(:tags)
+        item[:tags] = item[:tags]
+          .map{ |tag| tag.split.map(&:capitalize).join(' ') }
+      end
+    end
+  end
+
   def add_report_metadata
     @items.find_all('/about/verslagen/*/*').each do |report|
       report[:academic_year] = report.identifier.to_s.split('/')[-2]