diff --git a/culture-media.yaml b/culture-media.yaml
index 6f80c0c..3b9e697 100644
--- a/culture-media.yaml
+++ b/culture-media.yaml
@@ -67,19 +67,12 @@ filter:
     type: "select"
     key: "tourism"
     values: |
-      <option value='tourism-artwork' query='nwr[tourism=artwork]'>{{ tagTrans('tourism', 'artwork') }}</option>
-      <option value='tourism-attraction' query='nwr[tourism=attraction]'>{{ tagTrans('tourism', 'attraction') }}</option>
-      <option value='historic-memorial' query='nwr[historic=memorial]'>{{ tagTrans('historic', 'memorial') }}</option>
-      <option value='historic-monument' query='nwr[historic=monument]'>{{ tagTrans('historic', 'monument') }}</option>
-      <option value='historic-wayside_cross' query='nwr[historic=wayside_cross]'>{{ tagTrans('historic', 'wayside_cross') }}</option>
-      <option value='historic-wayside_shrine' query='nwr[historic=wayside_shrine]'>{{ tagTrans('historic', 'wayside_shrine') }}</option>
-      <option value='historic-building' query='nwr[historic=building]'>{{ tagTrans('historic', 'building') }}</option>
-      <option value='historic-other' query='nwr[historic][historic!~"^(memorial|monument|wayside_cross|wayside_shrine|building)$"]'>{{ keyTrans('historic') }} {{ trans('other') }}</option>
-      <option value='fountain' query='nwr[amenity=fountain]'>{{ tagTrans('amenity', 'fountain') }}</option>
-      <option value='arts_centre' query='nwr[amenity=arts_centre]'>{{ tagTrans('amenity', 'arts_centre') }}</option>
-      <option value='place_of_worship' query='nwr[amenity=place_of_worship]'>{{ tagTrans('amenity', 'place_of_worship') }}</option>
-      <option value='theatre' query='nwr[amenity=theatre]'>{{ tagTrans('amenity', 'theatre') }}</option>
-      <option value='heritage' query='nwr[heritage]'>{{ keyTrans('heritage') }}</option>
+      {% for kv, d in const.types %}
+        {% set k = kv|split('=')[0] %}
+        {% set v = kv|split('=')[1] %}
+        {% set d = d|default({}) %}
+        <option value='{{ kv }}' query='nwr[{{ d.query|default(kv) }}]'>{% if d.trans %}{{ trans(d.trans) }}{% elseif not v %}{{ keyTrans(k) }}{% else %}{{ tagTrans(k, v) }}{% endif %}</option>
+      {% endfor %}
     op: "has"
 info: |
   <table>
@@ -123,3 +116,20 @@ info: |
 
   This category lists artwork, memorials, historic and heritage protected objects. These should have an <a target="_blank" href="https://wiki.openstreetmap.org/wiki/Key:image">image</a> or <a target="_blank" href="https://wiki.openstreetmap.org/wiki/Key:wikimedia_commons">wikimedia_commons</a> tag, or (even better) a <a target="_blank" href="https://wiki.openstreetmap.org/wiki/Key:wikidata">wikidata</a> tag pointing to the object's entry.<br>
   Memorials erroneously often have a wikidata (and wikipedia) tag of the person/event, which should be changed to <a target="_blank" href="https://wiki.openstreetmap.org/wiki/Key:wikidata#Secondary_Wikidata_links">subject:wikidata</a> resp. <a target="_blank" href="https://wiki.openstreetmap.org/wiki/Key:wikipedia#Secondary_Wikipedia_links">subject:wikipedia</a>".
+const:
+  types:
+    tourism=artwork:
+    tourism=attraction:
+    historic=memorial:
+    historic=monument:
+    historic=wayside_cross:
+    historic=wayside_shrine:
+    historic=building:
+    amenity=fountain:
+    amenity=arts_centre:
+    amenity=place_of_worship:
+    amenity=theatre:
+    heritage:
+    other:
+      query: 'nwr[historic][historic!~"^(memorial|monument|wayside_cross|wayside_shrine|building)$"]'
+      trans: 'other'