diff --git a/messages.pot b/messages.pot
index 5108d9c..5057df0 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-14 16:26+0100\n"
+"POT-Creation-Date: 2021-11-17 01:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Legal notice"
 msgstr ""
 
-#: project/forms/admin.py:12 project/templates/_macros.html:1383
+#: project/forms/admin.py:12 project/templates/_macros.html:1392
 #: project/templates/layout.html:317
 #: project/templates/widget/event_suggestion/create.html:204
 #: project/views/admin_unit.py:73 project/views/root.py:53
@@ -326,7 +326,7 @@ msgstr ""
 msgid "The short name is used to create a unique identifier for your events"
 msgstr ""
 
-#: project/forms/admin_unit.py:41 project/templates/_macros.html:1519
+#: project/forms/admin_unit.py:41 project/templates/_macros.html:1528
 msgid "Short name must contain only letters numbers or underscore"
 msgstr ""
 
@@ -339,19 +339,19 @@ msgstr ""
 #: project/forms/admin_unit.py:48 project/forms/admin_unit_member.py:11
 #: project/forms/admin_unit_member.py:23 project/forms/admin_unit_member.py:28
 #: project/forms/event.py:107 project/forms/event_suggestion.py:38
-#: project/forms/organizer.py:27 project/templates/_macros.html:226
-#: project/templates/_macros.html:1479 project/templates/admin/users.html:19
+#: project/forms/organizer.py:27 project/templates/_macros.html:235
+#: project/templates/_macros.html:1488 project/templates/admin/users.html:19
 msgid "Email"
 msgstr ""
 
 #: project/forms/admin_unit.py:49 project/forms/event.py:108
 #: project/forms/event_suggestion.py:31 project/forms/organizer.py:28
-#: project/templates/_macros.html:279
+#: project/templates/_macros.html:288
 msgid "Phone"
 msgstr ""
 
 #: project/forms/admin_unit.py:50 project/forms/event.py:109
-#: project/forms/organizer.py:29 project/templates/_macros.html:287
+#: project/forms/organizer.py:29 project/templates/_macros.html:296
 msgid "Fax"
 msgstr ""
 
@@ -531,16 +531,16 @@ msgstr ""
 msgid "All-day"
 msgstr ""
 
-#: project/forms/event.py:54 project/templates/_macros.html:1699
+#: project/forms/event.py:54 project/templates/_macros.html:1708
 #: project/templates/widget/event_suggestion/create.html:240
 msgid "Recurring event"
 msgstr ""
 
-#: project/forms/event.py:61 project/templates/_macros.html:1240
+#: project/forms/event.py:61 project/templates/_macros.html:1249
 msgid "The start must be before the end."
 msgstr ""
 
-#: project/forms/event.py:67 project/templates/_macros.html:1257
+#: project/forms/event.py:67 project/templates/_macros.html:1266
 msgid "An event can last a maximum of 14 days."
 msgstr ""
 
@@ -574,7 +574,7 @@ msgstr ""
 msgid "Enter a link where tickets can be purchased."
 msgstr ""
 
-#: project/forms/event.py:136 project/templates/_macros.html:208
+#: project/forms/event.py:136 project/templates/_macros.html:217
 msgid "Tags"
 msgstr ""
 
@@ -624,7 +624,7 @@ msgstr ""
 msgid "If the participants needs to register for the event."
 msgstr ""
 
-#: project/forms/event.py:170 project/templates/_macros.html:240
+#: project/forms/event.py:170 project/templates/_macros.html:249
 #: project/templates/layout.html:128
 msgid "Booked up"
 msgstr ""
@@ -704,8 +704,8 @@ msgid ""
 " course it works without it."
 msgstr ""
 
-#: project/forms/event.py:242 project/templates/_macros.html:387
-#: project/templates/_macros.html:550
+#: project/forms/event.py:242 project/templates/_macros.html:396
+#: project/templates/_macros.html:559
 msgid "Previous start date"
 msgstr ""
 
@@ -751,7 +751,7 @@ msgstr ""
 
 #: project/forms/event.py:286 project/forms/event.py:295
 #: project/forms/event.py:368 project/forms/event_suggestion.py:50
-#: project/templates/_macros.html:427 project/templates/_macros.html:587
+#: project/templates/_macros.html:436 project/templates/_macros.html:596
 #: project/templates/event/create.html:304
 #: project/templates/event/update.html:185
 #: project/templates/event_place/create.html:31
@@ -770,8 +770,8 @@ msgstr ""
 
 #: project/forms/event.py:302 project/forms/event.py:311
 #: project/forms/event.py:376 project/forms/event.py:439
-#: project/forms/event_suggestion.py:60 project/templates/_macros.html:464
-#: project/templates/_macros.html:624 project/templates/event/create.html:273
+#: project/forms/event_suggestion.py:60 project/templates/_macros.html:473
+#: project/templates/_macros.html:633 project/templates/event/create.html:273
 #: project/templates/event/update.html:175
 #: project/templates/organizer/create.html:27
 #: project/templates/organizer/delete.html:13
@@ -856,7 +856,7 @@ msgstr ""
 msgid "PublicStatus.published"
 msgstr ""
 
-#: project/forms/event.py:402 project/templates/_macros.html:246
+#: project/forms/event.py:402 project/templates/_macros.html:255
 msgid "PublicStatus.draft"
 msgstr ""
 
@@ -869,7 +869,7 @@ msgstr ""
 msgid "Update event"
 msgstr ""
 
-#: project/forms/event.py:423 project/templates/_macros.html:1212
+#: project/forms/event.py:423 project/templates/_macros.html:1221
 #: project/templates/event/actions.html:47
 #: project/templates/event/delete.html:6
 msgid "Delete event"
@@ -890,7 +890,7 @@ msgid "Keyword"
 msgstr ""
 
 #: project/forms/event.py:436 project/forms/event_date.py:21
-#: project/forms/planing.py:19 project/templates/_macros.html:360
+#: project/forms/planing.py:19 project/templates/_macros.html:369
 msgid "Category"
 msgstr ""
 
@@ -899,7 +899,7 @@ msgid "Find events"
 msgstr ""
 
 #: project/forms/event_date.py:24 project/forms/planing.py:22
-#: project/templates/_macros.html:294
+#: project/templates/_macros.html:303
 #: project/templates/admin_unit/create.html:38
 #: project/templates/admin_unit/update.html:39
 #: project/templates/event_place/create.html:40
@@ -1042,7 +1042,7 @@ msgid "Weekdays"
 msgstr ""
 
 #: project/forms/reference.py:11 project/forms/reference_request.py:16
-#: project/templates/_macros.html:480 project/templates/_macros.html:640
+#: project/templates/_macros.html:489 project/templates/_macros.html:649
 #: project/templates/admin_unit/create.html:28
 #: project/templates/admin_unit/update.html:29
 #: project/templates/layout.html:258
@@ -1070,7 +1070,7 @@ msgstr ""
 msgid "Delete request"
 msgstr ""
 
-#: project/forms/reference_request.py:28 project/templates/_macros.html:1395
+#: project/forms/reference_request.py:28 project/templates/_macros.html:1404
 #: project/templates/event_suggestion/review_status.html:18
 #: project/templates/reference_request/review_status.html:12
 msgid "Review status"
@@ -1132,39 +1132,39 @@ msgstr ""
 msgid "This field is required."
 msgstr ""
 
-#: project/templates/_macros.html:138
+#: project/templates/_macros.html:147
 msgid "Show on Google Maps"
 msgstr ""
 
-#: project/templates/_macros.html:217
+#: project/templates/_macros.html:226
 msgid "Link"
 msgstr ""
 
-#: project/templates/_macros.html:273
+#: project/templates/_macros.html:282
 msgid "Verified"
 msgstr ""
 
-#: project/templates/_macros.html:337
-#, python-format
-msgid "Created at %(created_at)s by %(created_by)s."
-msgstr ""
-
-#: project/templates/_macros.html:339
-#, python-format
-msgid "Created at %(created_at)s."
-msgstr ""
-
-#: project/templates/_macros.html:344
-#, python-format
-msgid "Last updated at %(updated_at)s by %(updated_by)s."
-msgstr ""
-
 #: project/templates/_macros.html:346
 #, python-format
+msgid "Created at %(created_at)s by %(created_by)s."
+msgstr ""
+
+#: project/templates/_macros.html:348
+#, python-format
+msgid "Created at %(created_at)s."
+msgstr ""
+
+#: project/templates/_macros.html:353
+#, python-format
+msgid "Last updated at %(updated_at)s by %(updated_by)s."
+msgstr ""
+
+#: project/templates/_macros.html:355
+#, python-format
 msgid "Last updated at %(updated_at)s."
 msgstr ""
 
-#: project/templates/_macros.html:376 project/templates/_macros.html:546
+#: project/templates/_macros.html:385 project/templates/_macros.html:555
 #: project/templates/event/actions.html:12
 #: project/templates/event/create.html:250
 #: project/templates/event/update.html:141
@@ -1172,58 +1172,58 @@ msgstr ""
 msgid "Event"
 msgstr ""
 
-#: project/templates/_macros.html:382 project/templates/_macros.html:908
+#: project/templates/_macros.html:391 project/templates/_macros.html:917
 msgid "Date"
 msgstr ""
 
-#: project/templates/_macros.html:409 project/templates/_macros.html:568
-#: project/templates/_macros.html:1464 project/templates/event/actions.html:32
+#: project/templates/_macros.html:418 project/templates/_macros.html:577
+#: project/templates/_macros.html:1473 project/templates/event/actions.html:32
 msgid "Share"
 msgstr ""
 
-#: project/templates/_macros.html:413 project/templates/_macros.html:572
-#: project/templates/_macros.html:1494
+#: project/templates/_macros.html:422 project/templates/_macros.html:581
+#: project/templates/_macros.html:1503
 msgid "Add to calendar"
 msgstr ""
 
-#: project/templates/_macros.html:421 project/templates/_macros.html:580
+#: project/templates/_macros.html:430 project/templates/_macros.html:589
 #: project/templates/event/report.html:4
 msgid "Report event"
 msgstr ""
 
-#: project/templates/_macros.html:448 project/templates/_macros.html:606
+#: project/templates/_macros.html:457 project/templates/_macros.html:615
 msgid "Show directions"
 msgstr ""
 
-#: project/templates/_macros.html:453 project/templates/_macros.html:611
+#: project/templates/_macros.html:462 project/templates/_macros.html:620
 msgid "The event takes place online."
 msgstr ""
 
-#: project/templates/_macros.html:455 project/templates/_macros.html:613
+#: project/templates/_macros.html:464 project/templates/_macros.html:622
 msgid "The event takes place both offline and online."
 msgstr ""
 
-#: project/templates/_macros.html:667 project/templates/event_date/list.html:5
-#: project/templates/event_date/list.html:300
+#: project/templates/_macros.html:676 project/templates/event_date/list.html:5
+#: project/templates/event_date/list.html:299
 #: project/templates/reference_request/review.html:32
 msgid "Event Dates"
 msgstr ""
 
-#: project/templates/_macros.html:759
+#: project/templates/_macros.html:768
 msgid "Search location on Google"
 msgstr ""
 
-#: project/templates/_macros.html:825
+#: project/templates/_macros.html:834
 #, python-format
 msgid "%(count)d event dates"
 msgstr ""
 
-#: project/templates/_macros.html:848 project/templates/_macros.html:850
+#: project/templates/_macros.html:857 project/templates/_macros.html:859
 #: project/templates/event_date/list.html:321
 msgid "First"
 msgstr ""
 
-#: project/templates/_macros.html:853 project/templates/_macros.html:855
+#: project/templates/_macros.html:862 project/templates/_macros.html:864
 #: project/templates/event_date/list.html:322
 #: project/templates/widget/event_suggestion/create.html:193
 #: project/templates/widget/event_suggestion/create.html:218
@@ -1234,12 +1234,12 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: project/templates/_macros.html:857
+#: project/templates/_macros.html:866
 #, python-format
 msgid "Page %(page)d of %(pages)d (%(total)d total)"
 msgstr ""
 
-#: project/templates/_macros.html:859 project/templates/_macros.html:861
+#: project/templates/_macros.html:868 project/templates/_macros.html:870
 #: project/templates/event_date/list.html:324
 #: project/templates/widget/event_suggestion/create.html:194
 #: project/templates/widget/event_suggestion/create.html:219
@@ -1249,77 +1249,77 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: project/templates/_macros.html:864 project/templates/_macros.html:866
+#: project/templates/_macros.html:873 project/templates/_macros.html:875
 #: project/templates/event_date/list.html:325
 msgid "Last"
 msgstr ""
 
-#: project/templates/_macros.html:931
+#: project/templates/_macros.html:940
 msgid "Radius"
 msgstr ""
 
-#: project/templates/_macros.html:1141
+#: project/templates/_macros.html:1150
 msgid "Edit image"
 msgstr ""
 
-#: project/templates/_macros.html:1162
+#: project/templates/_macros.html:1171
 msgid "Close"
 msgstr ""
 
-#: project/templates/_macros.html:1163
+#: project/templates/_macros.html:1172
 msgid "Okay"
 msgstr ""
 
-#: project/templates/_macros.html:1175
+#: project/templates/_macros.html:1184
 msgid "Choose image file"
 msgstr ""
 
-#: project/templates/_macros.html:1211 project/templates/event/actions.html:46
+#: project/templates/_macros.html:1220 project/templates/event/actions.html:46
 msgid "Edit event"
 msgstr ""
 
-#: project/templates/_macros.html:1214 project/templates/manage/events.html:45
+#: project/templates/_macros.html:1223 project/templates/manage/events.html:45
 msgid "More"
 msgstr ""
 
-#: project/templates/_macros.html:1261
+#: project/templates/_macros.html:1270
 msgid "Please enter a valid time, between 00:00 and 23:59."
 msgstr ""
 
-#: project/templates/_macros.html:1289
+#: project/templates/_macros.html:1298
 #, python-format
 msgid "Just use %(term)s"
 msgstr ""
 
-#: project/templates/_macros.html:1355
+#: project/templates/_macros.html:1364
 msgid "Event suggestion"
 msgstr ""
 
-#: project/templates/_macros.html:1473
+#: project/templates/_macros.html:1482
 msgid "Link copied"
 msgstr ""
 
-#: project/templates/_macros.html:1473
+#: project/templates/_macros.html:1482
 msgid "Copy link"
 msgstr ""
 
-#: project/templates/_macros.html:1502
+#: project/templates/_macros.html:1511
 msgid "Google calendar"
 msgstr ""
 
-#: project/templates/_macros.html:1503
+#: project/templates/_macros.html:1512
 msgid "Apple calendar"
 msgstr ""
 
-#: project/templates/_macros.html:1504
+#: project/templates/_macros.html:1513
 msgid "Yahoo calendar"
 msgstr ""
 
-#: project/templates/_macros.html:1505
+#: project/templates/_macros.html:1514
 msgid "Other calendar"
 msgstr ""
 
-#: project/templates/_macros.html:1700
+#: project/templates/_macros.html:1709
 msgid "Remove event date"
 msgstr ""
 
@@ -1687,6 +1687,14 @@ msgstr ""
 msgid "Request reference for event \"%(name)s\""
 msgstr ""
 
+#: project/templates/event_date/list.html:301
+msgid "Search"
+msgstr ""
+
+#: project/templates/event_date/list.html:302
+msgid "Map view"
+msgstr ""
+
 #: project/templates/event_suggestion/review.html:20
 #: project/templates/manage/reviews.html:19
 msgid "Review event suggestion"
@@ -1974,27 +1982,27 @@ msgstr ""
 msgid "Invitation successfully deleted"
 msgstr ""
 
-#: project/views/event.py:177
+#: project/views/event.py:178
 msgid "Event successfully published"
 msgstr ""
 
-#: project/views/event.py:179
+#: project/views/event.py:180
 msgid "Draft successfully saved"
 msgstr ""
 
-#: project/views/event.py:222
+#: project/views/event.py:223
 msgid "Event successfully updated"
 msgstr ""
 
-#: project/views/event.py:248
+#: project/views/event.py:249
 msgid "Event successfully deleted"
 msgstr ""
 
-#: project/views/event.py:403
+#: project/views/event.py:408
 msgid "Referenced event changed"
 msgstr ""
 
-#: project/views/event.py:426
+#: project/views/event.py:431
 msgid "New event report"
 msgstr ""
 
diff --git a/migrations/versions/12aac790ed5e_.py b/migrations/versions/12aac790ed5e_.py
new file mode 100644
index 0000000..2519c6a
--- /dev/null
+++ b/migrations/versions/12aac790ed5e_.py
@@ -0,0 +1,39 @@
+"""empty message
+
+Revision ID: 12aac790ed5e
+Revises: f350153a5691
+Create Date: 2021-11-16 09:01:00.569170
+
+"""
+import sqlalchemy as sa
+import sqlalchemy_utils
+from alembic import op
+
+from project import dbtypes
+
+# revision identifiers, used by Alembic.
+revision = "12aac790ed5e"
+down_revision = "f350153a5691"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.create_index(
+        "idx_event_fulltext",
+        "event",
+        [
+            sa.text(
+                """(
+                (setweight(to_tsvector('german', coalesce(name, '')), 'A')) ||
+                (setweight(to_tsvector('german', coalesce(tags, '')), 'B')) ||
+                (setweight(to_tsvector('german', coalesce(description, '')), 'C'))
+            )"""
+            )
+        ],
+        postgresql_using="gin",
+    )
+
+
+def downgrade():
+    op.drop_index("idx_event_fulltext")
diff --git a/project/models.py b/project/models.py
index 00833c1..f1d770c 100644
--- a/project/models.py
+++ b/project/models.py
@@ -33,6 +33,7 @@ from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import aliased, backref, deferred, object_session, relationship
 from sqlalchemy.orm.relationships import remote
 from sqlalchemy.schema import CheckConstraint
+from sqlalchemy.sql.operators import op
 from sqlalchemy_utils import ColorType
 
 from project import db
@@ -43,6 +44,20 @@ from project.utils import make_check_violation
 # Base
 
 
+def create_tsvector(*args):
+    field, weight = args[0]
+    exp = func.setweight(func.to_tsvector("german", func.coalesce(field, "")), weight)
+    for field, weight in args[1:]:
+        exp = op(
+            exp,
+            "||",
+            func.setweight(
+                func.to_tsvector("german", func.coalesce(field, "")), weight
+            ),
+        )
+    return exp
+
+
 def _current_user_id_or_none():
     if current_user and current_user.is_authenticated:
         return current_user.id
@@ -779,6 +794,10 @@ class EventMixin(object):
     expected_participants = Column(Integer())
     price_info = Column(UnicodeText())
 
+    @declared_attr
+    def __ts_vector__(cls):
+        return create_tsvector((cls.name, "A"), (cls.tags, "B"), (cls.description, "C"))
+
     @declared_attr
     def photo_id(cls):
         return Column("photo_id", ForeignKey("image.id"))
diff --git a/project/services/event.py b/project/services/event.py
index 0d882a5..025afdd 100644
--- a/project/services/event.py
+++ b/project/services/event.py
@@ -52,14 +52,10 @@ def upsert_event_category(category_name):
 
 def fill_event_filter(event_filter, params):
     if params.keyword:
-        like_keyword = "%" + params.keyword + "%"
+        tq = func.websearch_to_tsquery("german", params.keyword)
         event_filter = and_(
             event_filter,
-            or_(
-                Event.name.ilike(like_keyword),
-                Event.description.ilike(like_keyword),
-                Event.tags.ilike(like_keyword),
-            ),
+            Event.__ts_vector__.op("@@")(tq),
         )
 
     if params.category_id:
diff --git a/project/templates/_macros.html b/project/templates/_macros.html
index 1ed4324..46eef2d 100644
--- a/project/templates/_macros.html
+++ b/project/templates/_macros.html
@@ -9,10 +9,15 @@
 
       {% set is_required = kwargs['is_required'] if 'is_required' in kwargs else field.flags.required %}
       {% set label_text = field.label.text + ' *' if is_required else field.label.text %}
-      <div class="form-group {% if field.errors %} has-error{% endif -%}">
+      <div class="form-group {% if field.errors %} has-error{% endif -%} {% if 'formrow' in kwargs %} row{% endif -%}">
         {% if 'label_hidden' in kwargs or ('ri' in kwargs and kwargs['ri'] == 'checkbox') %}
         {% else %}
-        {{ field.label(text=label_text, class="mb-0") }}
+          {% set label_class = "col-sm-2 col-form-label" if 'formrow' in kwargs else "mb-0" %}
+          {{ field.label(text=label_text, class=label_class) }}
+        {% endif %}
+
+        {% if 'formrow' in kwargs %}
+        <div class="col-sm-10">
         {% endif %}
 
         {% if field.description %}
@@ -90,6 +95,10 @@
             {% endfor %}
         </div>
         {% endif %}
+
+        {% if 'formrow' in kwargs %}
+      </div>
+        {% endif %}
       </div>
 
     {% if is_collapsible %}
@@ -959,21 +968,21 @@
   {{ form.hidden_tag() }}
 
   {% if form.keyword %}
-    {{ render_field_with_errors(form.keyword) }}
+    {{ render_field_with_errors(form.keyword, formrow="1") }}
   {% endif %}
 
   {% if form.category_id %}
-    {{ render_field_with_errors(form.category_id) }}
+    {{ render_field_with_errors(form.category_id, formrow="1") }}
   {% endif %}
 
   {% if form.organizer_id %}
-    {{ render_field_with_errors(form.organizer_id) }}
+    {{ render_field_with_errors(form.organizer_id, formrow="1") }}
   {% endif %}
 
   {{ render_event_dates_date_field(form.date_from, form.date_to) }}
 
   {% if form.weekday and form.weekday.choices|length > 0 %}
-    {{ render_field_with_errors(form.weekday, ri="multicheckbox") }}
+    {{ render_field_with_errors(form.weekday, ri="multicheckbox", formrow="1") }}
   {% endif %}
 
   {{ render_event_dates_location_field(form.location, form.distance) }}
diff --git a/project/templates/event_date/list.html b/project/templates/event_date/list.html
index 36712ea..8aeea77 100644
--- a/project/templates/event_date/list.html
+++ b/project/templates/event_date/list.html
@@ -296,11 +296,11 @@
 
 {% block content %}
 
-    <h1>
-        {{ _('Event Dates') }}
-        <button type="button" id="toggle-search-btn" class="btn btn-outline-secondary mx-2" data-toggle="collapse" data-target="#search_form" aria-expanded="{% if form.is_submitted() %}true{% else %}false{% endif %}"><i class="fa fa-search"></i></button>
-        <button type="button" id="toggle-map-btn" class="btn btn-outline-secondary" onclick="toggle_map()"><i class="fa fa-map"></i></button>
-    </h1>
+    <h1 class="mb-3">{{ _('Event Dates') }}</h1>
+    <div class="btn-group mb-3">
+        <button type="button" id="toggle-search-btn" class="btn btn-outline-secondary btn-sm" data-toggle="collapse" data-target="#search_form" aria-expanded="{% if form.is_submitted() %}true{% else %}false{% endif %}"><i class="fa fa-search"></i> {{ _('Search') }}</button>
+        <button type="button" id="toggle-map-btn" class="btn btn-outline-secondary btn-sm" onclick="toggle_map()"><i class="fa fa-map"></i> {{ _('Map view') }}</button>
+    </div>
 
     <div class="{% if form.is_submitted() %}{% else %}collapse{% endif %}" id="search_form">
         {{ render_event_dates_filter_form(form) }}
diff --git a/project/translations/de/LC_MESSAGES/messages.mo b/project/translations/de/LC_MESSAGES/messages.mo
index 13124d5..c9d109b 100644
Binary files a/project/translations/de/LC_MESSAGES/messages.mo and b/project/translations/de/LC_MESSAGES/messages.mo differ
diff --git a/project/translations/de/LC_MESSAGES/messages.po b/project/translations/de/LC_MESSAGES/messages.po
index a3c4a0c..1bea18e 100644
--- a/project/translations/de/LC_MESSAGES/messages.po
+++ b/project/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-14 16:26+0100\n"
+"POT-Creation-Date: 2021-11-17 01:07+0100\n"
 "PO-Revision-Date: 2020-06-07 18:51+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: de\n"
@@ -205,7 +205,7 @@ msgstr "Nutzungsbedingungen"
 msgid "Legal notice"
 msgstr "Impressum"
 
-#: project/forms/admin.py:12 project/templates/_macros.html:1383
+#: project/forms/admin.py:12 project/templates/_macros.html:1392
 #: project/templates/layout.html:317
 #: project/templates/widget/event_suggestion/create.html:204
 #: project/views/admin_unit.py:73 project/views/root.py:53
@@ -338,7 +338,7 @@ msgstr ""
 "eindeutig zu identifizieren. Der Kurzname darf nur Buchstaben, Nummern "
 "und Unterstriche enthalten."
 
-#: project/forms/admin_unit.py:41 project/templates/_macros.html:1519
+#: project/forms/admin_unit.py:41 project/templates/_macros.html:1528
 msgid "Short name must contain only letters numbers or underscore"
 msgstr "Der Kurzname darf nur Buchstaben, Nummern und Unterstriche enthalten"
 
@@ -351,19 +351,19 @@ msgstr "Link URL"
 #: project/forms/admin_unit.py:48 project/forms/admin_unit_member.py:11
 #: project/forms/admin_unit_member.py:23 project/forms/admin_unit_member.py:28
 #: project/forms/event.py:107 project/forms/event_suggestion.py:38
-#: project/forms/organizer.py:27 project/templates/_macros.html:226
-#: project/templates/_macros.html:1479 project/templates/admin/users.html:19
+#: project/forms/organizer.py:27 project/templates/_macros.html:235
+#: project/templates/_macros.html:1488 project/templates/admin/users.html:19
 msgid "Email"
 msgstr "Email"
 
 #: project/forms/admin_unit.py:49 project/forms/event.py:108
 #: project/forms/event_suggestion.py:31 project/forms/organizer.py:28
-#: project/templates/_macros.html:279
+#: project/templates/_macros.html:288
 msgid "Phone"
 msgstr "Telefon"
 
 #: project/forms/admin_unit.py:50 project/forms/event.py:109
-#: project/forms/organizer.py:29 project/templates/_macros.html:287
+#: project/forms/organizer.py:29 project/templates/_macros.html:296
 msgid "Fax"
 msgstr "Fax"
 
@@ -550,16 +550,16 @@ msgstr "Gib an, wann der Termin endet. Ein Termin darf maximal 14 Tage dauern."
 msgid "All-day"
 msgstr "Ganztägig"
 
-#: project/forms/event.py:54 project/templates/_macros.html:1699
+#: project/forms/event.py:54 project/templates/_macros.html:1708
 #: project/templates/widget/event_suggestion/create.html:240
 msgid "Recurring event"
 msgstr "Serientermin"
 
-#: project/forms/event.py:61 project/templates/_macros.html:1240
+#: project/forms/event.py:61 project/templates/_macros.html:1249
 msgid "The start must be before the end."
 msgstr "Der Start muss vor dem Ende sein."
 
-#: project/forms/event.py:67 project/templates/_macros.html:1257
+#: project/forms/event.py:67 project/templates/_macros.html:1266
 msgid "An event can last a maximum of 14 days."
 msgstr "Eine Veranstaltung darf maximal 14 Tage dauern."
 
@@ -595,7 +595,7 @@ msgstr "Ticket Link"
 msgid "Enter a link where tickets can be purchased."
 msgstr "Gib einen Link ein, über den Tickets gekauft werden können."
 
-#: project/forms/event.py:136 project/templates/_macros.html:208
+#: project/forms/event.py:136 project/templates/_macros.html:217
 msgid "Tags"
 msgstr "Stichworte"
 
@@ -648,7 +648,7 @@ msgstr "Anmeldung erforderlich"
 msgid "If the participants needs to register for the event."
 msgstr "Wenn sich die Teilnehmer für die Veranstaltung anmelden müssen."
 
-#: project/forms/event.py:170 project/templates/_macros.html:240
+#: project/forms/event.py:170 project/templates/_macros.html:249
 #: project/templates/layout.html:128
 msgid "Booked up"
 msgstr "Ausgebucht"
@@ -734,8 +734,8 @@ msgstr ""
 "Wir empfehlen dir, ein Foto für die Veranstaltung hochzuladen. Es macht "
 "schon deutlich mehr her, aber es geht natürlich auch ohne."
 
-#: project/forms/event.py:242 project/templates/_macros.html:387
-#: project/templates/_macros.html:550
+#: project/forms/event.py:242 project/templates/_macros.html:396
+#: project/templates/_macros.html:559
 msgid "Previous start date"
 msgstr "Vorheriges Startdatum"
 
@@ -787,7 +787,7 @@ msgstr "Ungültiger Mitveranstalter."
 
 #: project/forms/event.py:286 project/forms/event.py:295
 #: project/forms/event.py:368 project/forms/event_suggestion.py:50
-#: project/templates/_macros.html:427 project/templates/_macros.html:587
+#: project/templates/_macros.html:436 project/templates/_macros.html:596
 #: project/templates/event/create.html:304
 #: project/templates/event/update.html:185
 #: project/templates/event_place/create.html:31
@@ -806,8 +806,8 @@ msgstr "Neuen Ort eingeben"
 
 #: project/forms/event.py:302 project/forms/event.py:311
 #: project/forms/event.py:376 project/forms/event.py:439
-#: project/forms/event_suggestion.py:60 project/templates/_macros.html:464
-#: project/templates/_macros.html:624 project/templates/event/create.html:273
+#: project/forms/event_suggestion.py:60 project/templates/_macros.html:473
+#: project/templates/_macros.html:633 project/templates/event/create.html:273
 #: project/templates/event/update.html:175
 #: project/templates/organizer/create.html:27
 #: project/templates/organizer/delete.html:13
@@ -896,7 +896,7 @@ msgstr "Öffentlicher Status"
 msgid "PublicStatus.published"
 msgstr "Veröffentlicht"
 
-#: project/forms/event.py:402 project/templates/_macros.html:246
+#: project/forms/event.py:402 project/templates/_macros.html:255
 msgid "PublicStatus.draft"
 msgstr "Entwurf"
 
@@ -909,7 +909,7 @@ msgstr "Wähle den öffentlichen Status der Veranstaltung."
 msgid "Update event"
 msgstr "Veranstaltung aktualisieren"
 
-#: project/forms/event.py:423 project/templates/_macros.html:1212
+#: project/forms/event.py:423 project/templates/_macros.html:1221
 #: project/templates/event/actions.html:47
 #: project/templates/event/delete.html:6
 msgid "Delete event"
@@ -930,7 +930,7 @@ msgid "Keyword"
 msgstr "Stichwort"
 
 #: project/forms/event.py:436 project/forms/event_date.py:21
-#: project/forms/planing.py:19 project/templates/_macros.html:360
+#: project/forms/planing.py:19 project/templates/_macros.html:369
 msgid "Category"
 msgstr "Kategorie"
 
@@ -939,7 +939,7 @@ msgid "Find events"
 msgstr "Veranstaltungen finden"
 
 #: project/forms/event_date.py:24 project/forms/planing.py:22
-#: project/templates/_macros.html:294
+#: project/templates/_macros.html:303
 #: project/templates/admin_unit/create.html:38
 #: project/templates/admin_unit/update.html:39
 #: project/templates/event_place/create.html:40
@@ -1086,7 +1086,7 @@ msgid "Weekdays"
 msgstr "Wochentage"
 
 #: project/forms/reference.py:11 project/forms/reference_request.py:16
-#: project/templates/_macros.html:480 project/templates/_macros.html:640
+#: project/templates/_macros.html:489 project/templates/_macros.html:649
 #: project/templates/admin_unit/create.html:28
 #: project/templates/admin_unit/update.html:29
 #: project/templates/layout.html:258
@@ -1114,7 +1114,7 @@ msgstr "Anfrage speichern"
 msgid "Delete request"
 msgstr "Anfrage löschen"
 
-#: project/forms/reference_request.py:28 project/templates/_macros.html:1395
+#: project/forms/reference_request.py:28 project/templates/_macros.html:1404
 #: project/templates/event_suggestion/review_status.html:18
 #: project/templates/reference_request/review_status.html:12
 msgid "Review status"
@@ -1176,39 +1176,39 @@ msgstr "Ablehnen"
 msgid "This field is required."
 msgstr "Dieses Feld ist erforderlich."
 
-#: project/templates/_macros.html:138
+#: project/templates/_macros.html:147
 msgid "Show on Google Maps"
 msgstr "Auf Google Maps anzeigen"
 
-#: project/templates/_macros.html:217
+#: project/templates/_macros.html:226
 msgid "Link"
 msgstr "Link"
 
-#: project/templates/_macros.html:273
+#: project/templates/_macros.html:282
 msgid "Verified"
 msgstr "Verifiziert"
 
-#: project/templates/_macros.html:337
+#: project/templates/_macros.html:346
 #, python-format
 msgid "Created at %(created_at)s by %(created_by)s."
 msgstr "Erstellt am %(created_at)s von %(created_by)s."
 
-#: project/templates/_macros.html:339
+#: project/templates/_macros.html:348
 #, python-format
 msgid "Created at %(created_at)s."
 msgstr "Erstellt am %(created_at)s."
 
-#: project/templates/_macros.html:344
+#: project/templates/_macros.html:353
 #, python-format
 msgid "Last updated at %(updated_at)s by %(updated_by)s."
 msgstr "Zuletzt aktualisiert am %(updated_at)s von %(updated_by)s."
 
-#: project/templates/_macros.html:346
+#: project/templates/_macros.html:355
 #, python-format
 msgid "Last updated at %(updated_at)s."
 msgstr "Zuletzt aktualisiert am %(updated_at)s."
 
-#: project/templates/_macros.html:376 project/templates/_macros.html:546
+#: project/templates/_macros.html:385 project/templates/_macros.html:555
 #: project/templates/event/actions.html:12
 #: project/templates/event/create.html:250
 #: project/templates/event/update.html:141
@@ -1216,60 +1216,60 @@ msgstr "Zuletzt aktualisiert am %(updated_at)s."
 msgid "Event"
 msgstr "Veranstaltung"
 
-#: project/templates/_macros.html:382 project/templates/_macros.html:908
+#: project/templates/_macros.html:391 project/templates/_macros.html:917
 msgid "Date"
 msgstr "Datum"
 
-#: project/templates/_macros.html:409 project/templates/_macros.html:568
-#: project/templates/_macros.html:1464 project/templates/event/actions.html:32
+#: project/templates/_macros.html:418 project/templates/_macros.html:577
+#: project/templates/_macros.html:1473 project/templates/event/actions.html:32
 msgid "Share"
 msgstr "Teilen"
 
-#: project/templates/_macros.html:413 project/templates/_macros.html:572
-#: project/templates/_macros.html:1494
+#: project/templates/_macros.html:422 project/templates/_macros.html:581
+#: project/templates/_macros.html:1503
 msgid "Add to calendar"
 msgstr "Zum Kalender"
 
-#: project/templates/_macros.html:421 project/templates/_macros.html:580
+#: project/templates/_macros.html:430 project/templates/_macros.html:589
 #: project/templates/event/report.html:4
 msgid "Report event"
 msgstr "Veranstaltung melden"
 
-#: project/templates/_macros.html:448 project/templates/_macros.html:606
+#: project/templates/_macros.html:457 project/templates/_macros.html:615
 msgid "Show directions"
 msgstr "Anreise planen"
 
-#: project/templates/_macros.html:453 project/templates/_macros.html:611
+#: project/templates/_macros.html:462 project/templates/_macros.html:620
 msgid "The event takes place online."
 msgstr "Die Veranstaltung findet online statt."
 
-#: project/templates/_macros.html:455 project/templates/_macros.html:613
+#: project/templates/_macros.html:464 project/templates/_macros.html:622
 msgid "The event takes place both offline and online."
 msgstr ""
 "Die Veranstaltung findet sowohl als Präsenzveranstaltung als auch online "
 "statt."
 
-#: project/templates/_macros.html:667 project/templates/event_date/list.html:5
-#: project/templates/event_date/list.html:300
+#: project/templates/_macros.html:676 project/templates/event_date/list.html:5
+#: project/templates/event_date/list.html:299
 #: project/templates/reference_request/review.html:32
 msgid "Event Dates"
 msgstr "Termine"
 
-#: project/templates/_macros.html:759
+#: project/templates/_macros.html:768
 msgid "Search location on Google"
 msgstr "Ort bei Google suchen"
 
-#: project/templates/_macros.html:825
+#: project/templates/_macros.html:834
 #, python-format
 msgid "%(count)d event dates"
 msgstr "%(count)d Termine"
 
-#: project/templates/_macros.html:848 project/templates/_macros.html:850
+#: project/templates/_macros.html:857 project/templates/_macros.html:859
 #: project/templates/event_date/list.html:321
 msgid "First"
 msgstr "Letzte"
 
-#: project/templates/_macros.html:853 project/templates/_macros.html:855
+#: project/templates/_macros.html:862 project/templates/_macros.html:864
 #: project/templates/event_date/list.html:322
 #: project/templates/widget/event_suggestion/create.html:193
 #: project/templates/widget/event_suggestion/create.html:218
@@ -1280,12 +1280,12 @@ msgstr "Letzte"
 msgid "Previous"
 msgstr "Zurück"
 
-#: project/templates/_macros.html:857
+#: project/templates/_macros.html:866
 #, python-format
 msgid "Page %(page)d of %(pages)d (%(total)d total)"
 msgstr "Seite %(page)d von %(pages)d (%(total)d insgesamt)"
 
-#: project/templates/_macros.html:859 project/templates/_macros.html:861
+#: project/templates/_macros.html:868 project/templates/_macros.html:870
 #: project/templates/event_date/list.html:324
 #: project/templates/widget/event_suggestion/create.html:194
 #: project/templates/widget/event_suggestion/create.html:219
@@ -1295,77 +1295,77 @@ msgstr "Seite %(page)d von %(pages)d (%(total)d insgesamt)"
 msgid "Next"
 msgstr "Weiter"
 
-#: project/templates/_macros.html:864 project/templates/_macros.html:866
+#: project/templates/_macros.html:873 project/templates/_macros.html:875
 #: project/templates/event_date/list.html:325
 msgid "Last"
 msgstr "Erste"
 
-#: project/templates/_macros.html:931
+#: project/templates/_macros.html:940
 msgid "Radius"
 msgstr "Umkreis"
 
-#: project/templates/_macros.html:1141
+#: project/templates/_macros.html:1150
 msgid "Edit image"
 msgstr "Bild bearbeiten"
 
-#: project/templates/_macros.html:1162
+#: project/templates/_macros.html:1171
 msgid "Close"
 msgstr "Schließen"
 
-#: project/templates/_macros.html:1163
+#: project/templates/_macros.html:1172
 msgid "Okay"
 msgstr "OK"
 
-#: project/templates/_macros.html:1175
+#: project/templates/_macros.html:1184
 msgid "Choose image file"
 msgstr "Bild-Datei auswählen"
 
-#: project/templates/_macros.html:1211 project/templates/event/actions.html:46
+#: project/templates/_macros.html:1220 project/templates/event/actions.html:46
 msgid "Edit event"
 msgstr "Veranstaltung bearbeiten"
 
-#: project/templates/_macros.html:1214 project/templates/manage/events.html:45
+#: project/templates/_macros.html:1223 project/templates/manage/events.html:45
 msgid "More"
 msgstr "Mehr"
 
-#: project/templates/_macros.html:1261
+#: project/templates/_macros.html:1270
 msgid "Please enter a valid time, between 00:00 and 23:59."
 msgstr "Bitte gib eine gültige Uhrzeit zwischen 00:00 und 23:59 ein."
 
-#: project/templates/_macros.html:1289
+#: project/templates/_macros.html:1298
 #, python-format
 msgid "Just use %(term)s"
 msgstr "Verwende einfach %(term)s"
 
-#: project/templates/_macros.html:1355
+#: project/templates/_macros.html:1364
 msgid "Event suggestion"
 msgstr "Veranstaltungsvorschlag"
 
-#: project/templates/_macros.html:1473
+#: project/templates/_macros.html:1482
 msgid "Link copied"
 msgstr "Link kopiert"
 
-#: project/templates/_macros.html:1473
+#: project/templates/_macros.html:1482
 msgid "Copy link"
 msgstr "Link kopieren"
 
-#: project/templates/_macros.html:1502
+#: project/templates/_macros.html:1511
 msgid "Google calendar"
 msgstr "Google Kalender"
 
-#: project/templates/_macros.html:1503
+#: project/templates/_macros.html:1512
 msgid "Apple calendar"
 msgstr "Apple Kalender"
 
-#: project/templates/_macros.html:1504
+#: project/templates/_macros.html:1513
 msgid "Yahoo calendar"
 msgstr "Yahoo Kalender"
 
-#: project/templates/_macros.html:1505
+#: project/templates/_macros.html:1514
 msgid "Other calendar"
 msgstr "Anderer Kalender"
 
-#: project/templates/_macros.html:1700
+#: project/templates/_macros.html:1709
 msgid "Remove event date"
 msgstr "Termin entfernen"
 
@@ -1737,6 +1737,14 @@ msgstr "Veranstaltung \"%(name)s\" empfehlen"
 msgid "Request reference for event \"%(name)s\""
 msgstr "Empfehlung anfragen für Veranstaltung \"%(name)s\""
 
+#: project/templates/event_date/list.html:301
+msgid "Search"
+msgstr "Suchen"
+
+#: project/templates/event_date/list.html:302
+msgid "Map view"
+msgstr "Kartenansicht"
+
 #: project/templates/event_suggestion/review.html:20
 #: project/templates/manage/reviews.html:19
 msgid "Review event suggestion"
@@ -2029,27 +2037,27 @@ msgstr "Die eingegebene Email passt nicht zur Email der Einladung"
 msgid "Invitation successfully deleted"
 msgstr "Einladung erfolgreich gelöscht"
 
-#: project/views/event.py:177
+#: project/views/event.py:178
 msgid "Event successfully published"
 msgstr "Veranstaltung erfolgreich veröffentlicht"
 
-#: project/views/event.py:179
+#: project/views/event.py:180
 msgid "Draft successfully saved"
 msgstr "Entwurf erfolgreich gespeichert"
 
-#: project/views/event.py:222
+#: project/views/event.py:223
 msgid "Event successfully updated"
 msgstr "Veranstaltung erfolgreich aktualisiert"
 
-#: project/views/event.py:248
+#: project/views/event.py:249
 msgid "Event successfully deleted"
 msgstr "Veranstaltung erfolgreich gelöscht"
 
-#: project/views/event.py:403
+#: project/views/event.py:408
 msgid "Referenced event changed"
 msgstr "Empfohlene Veranstaltung wurde geändert"
 
-#: project/views/event.py:426
+#: project/views/event.py:431
 msgid "New event report"
 msgstr "Neue Meldung zu einer Veranstaltung"
 
diff --git a/project/translations/en/LC_MESSAGES/messages.mo b/project/translations/en/LC_MESSAGES/messages.mo
index 449fd59..2f2f716 100644
Binary files a/project/translations/en/LC_MESSAGES/messages.mo and b/project/translations/en/LC_MESSAGES/messages.mo differ
diff --git a/project/translations/en/LC_MESSAGES/messages.po b/project/translations/en/LC_MESSAGES/messages.po
index 9c21a48..55ab71c 100644
--- a/project/translations/en/LC_MESSAGES/messages.po
+++ b/project/translations/en/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-14 16:26+0100\n"
+"POT-Creation-Date: 2021-11-17 01:07+0100\n"
 "PO-Revision-Date: 2021-04-30 15:04+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Legal notice"
 msgstr ""
 
-#: project/forms/admin.py:12 project/templates/_macros.html:1383
+#: project/forms/admin.py:12 project/templates/_macros.html:1392
 #: project/templates/layout.html:317
 #: project/templates/widget/event_suggestion/create.html:204
 #: project/views/admin_unit.py:73 project/views/root.py:53
@@ -327,7 +327,7 @@ msgstr ""
 msgid "The short name is used to create a unique identifier for your events"
 msgstr ""
 
-#: project/forms/admin_unit.py:41 project/templates/_macros.html:1519
+#: project/forms/admin_unit.py:41 project/templates/_macros.html:1528
 msgid "Short name must contain only letters numbers or underscore"
 msgstr ""
 
@@ -340,19 +340,19 @@ msgstr ""
 #: project/forms/admin_unit.py:48 project/forms/admin_unit_member.py:11
 #: project/forms/admin_unit_member.py:23 project/forms/admin_unit_member.py:28
 #: project/forms/event.py:107 project/forms/event_suggestion.py:38
-#: project/forms/organizer.py:27 project/templates/_macros.html:226
-#: project/templates/_macros.html:1479 project/templates/admin/users.html:19
+#: project/forms/organizer.py:27 project/templates/_macros.html:235
+#: project/templates/_macros.html:1488 project/templates/admin/users.html:19
 msgid "Email"
 msgstr ""
 
 #: project/forms/admin_unit.py:49 project/forms/event.py:108
 #: project/forms/event_suggestion.py:31 project/forms/organizer.py:28
-#: project/templates/_macros.html:279
+#: project/templates/_macros.html:288
 msgid "Phone"
 msgstr ""
 
 #: project/forms/admin_unit.py:50 project/forms/event.py:109
-#: project/forms/organizer.py:29 project/templates/_macros.html:287
+#: project/forms/organizer.py:29 project/templates/_macros.html:296
 msgid "Fax"
 msgstr ""
 
@@ -532,16 +532,16 @@ msgstr ""
 msgid "All-day"
 msgstr ""
 
-#: project/forms/event.py:54 project/templates/_macros.html:1699
+#: project/forms/event.py:54 project/templates/_macros.html:1708
 #: project/templates/widget/event_suggestion/create.html:240
 msgid "Recurring event"
 msgstr ""
 
-#: project/forms/event.py:61 project/templates/_macros.html:1240
+#: project/forms/event.py:61 project/templates/_macros.html:1249
 msgid "The start must be before the end."
 msgstr ""
 
-#: project/forms/event.py:67 project/templates/_macros.html:1257
+#: project/forms/event.py:67 project/templates/_macros.html:1266
 msgid "An event can last a maximum of 14 days."
 msgstr ""
 
@@ -575,7 +575,7 @@ msgstr ""
 msgid "Enter a link where tickets can be purchased."
 msgstr ""
 
-#: project/forms/event.py:136 project/templates/_macros.html:208
+#: project/forms/event.py:136 project/templates/_macros.html:217
 msgid "Tags"
 msgstr ""
 
@@ -625,7 +625,7 @@ msgstr ""
 msgid "If the participants needs to register for the event."
 msgstr ""
 
-#: project/forms/event.py:170 project/templates/_macros.html:240
+#: project/forms/event.py:170 project/templates/_macros.html:249
 #: project/templates/layout.html:128
 msgid "Booked up"
 msgstr ""
@@ -705,8 +705,8 @@ msgid ""
 " course it works without it."
 msgstr ""
 
-#: project/forms/event.py:242 project/templates/_macros.html:387
-#: project/templates/_macros.html:550
+#: project/forms/event.py:242 project/templates/_macros.html:396
+#: project/templates/_macros.html:559
 msgid "Previous start date"
 msgstr ""
 
@@ -752,7 +752,7 @@ msgstr ""
 
 #: project/forms/event.py:286 project/forms/event.py:295
 #: project/forms/event.py:368 project/forms/event_suggestion.py:50
-#: project/templates/_macros.html:427 project/templates/_macros.html:587
+#: project/templates/_macros.html:436 project/templates/_macros.html:596
 #: project/templates/event/create.html:304
 #: project/templates/event/update.html:185
 #: project/templates/event_place/create.html:31
@@ -771,8 +771,8 @@ msgstr ""
 
 #: project/forms/event.py:302 project/forms/event.py:311
 #: project/forms/event.py:376 project/forms/event.py:439
-#: project/forms/event_suggestion.py:60 project/templates/_macros.html:464
-#: project/templates/_macros.html:624 project/templates/event/create.html:273
+#: project/forms/event_suggestion.py:60 project/templates/_macros.html:473
+#: project/templates/_macros.html:633 project/templates/event/create.html:273
 #: project/templates/event/update.html:175
 #: project/templates/organizer/create.html:27
 #: project/templates/organizer/delete.html:13
@@ -857,7 +857,7 @@ msgstr ""
 msgid "PublicStatus.published"
 msgstr ""
 
-#: project/forms/event.py:402 project/templates/_macros.html:246
+#: project/forms/event.py:402 project/templates/_macros.html:255
 msgid "PublicStatus.draft"
 msgstr ""
 
@@ -870,7 +870,7 @@ msgstr ""
 msgid "Update event"
 msgstr ""
 
-#: project/forms/event.py:423 project/templates/_macros.html:1212
+#: project/forms/event.py:423 project/templates/_macros.html:1221
 #: project/templates/event/actions.html:47
 #: project/templates/event/delete.html:6
 msgid "Delete event"
@@ -891,7 +891,7 @@ msgid "Keyword"
 msgstr ""
 
 #: project/forms/event.py:436 project/forms/event_date.py:21
-#: project/forms/planing.py:19 project/templates/_macros.html:360
+#: project/forms/planing.py:19 project/templates/_macros.html:369
 msgid "Category"
 msgstr ""
 
@@ -900,7 +900,7 @@ msgid "Find events"
 msgstr ""
 
 #: project/forms/event_date.py:24 project/forms/planing.py:22
-#: project/templates/_macros.html:294
+#: project/templates/_macros.html:303
 #: project/templates/admin_unit/create.html:38
 #: project/templates/admin_unit/update.html:39
 #: project/templates/event_place/create.html:40
@@ -1043,7 +1043,7 @@ msgid "Weekdays"
 msgstr ""
 
 #: project/forms/reference.py:11 project/forms/reference_request.py:16
-#: project/templates/_macros.html:480 project/templates/_macros.html:640
+#: project/templates/_macros.html:489 project/templates/_macros.html:649
 #: project/templates/admin_unit/create.html:28
 #: project/templates/admin_unit/update.html:29
 #: project/templates/layout.html:258
@@ -1071,7 +1071,7 @@ msgstr ""
 msgid "Delete request"
 msgstr ""
 
-#: project/forms/reference_request.py:28 project/templates/_macros.html:1395
+#: project/forms/reference_request.py:28 project/templates/_macros.html:1404
 #: project/templates/event_suggestion/review_status.html:18
 #: project/templates/reference_request/review_status.html:12
 msgid "Review status"
@@ -1133,39 +1133,39 @@ msgstr ""
 msgid "This field is required."
 msgstr ""
 
-#: project/templates/_macros.html:138
+#: project/templates/_macros.html:147
 msgid "Show on Google Maps"
 msgstr ""
 
-#: project/templates/_macros.html:217
+#: project/templates/_macros.html:226
 msgid "Link"
 msgstr ""
 
-#: project/templates/_macros.html:273
+#: project/templates/_macros.html:282
 msgid "Verified"
 msgstr ""
 
-#: project/templates/_macros.html:337
-#, python-format
-msgid "Created at %(created_at)s by %(created_by)s."
-msgstr ""
-
-#: project/templates/_macros.html:339
-#, python-format
-msgid "Created at %(created_at)s."
-msgstr ""
-
-#: project/templates/_macros.html:344
-#, python-format
-msgid "Last updated at %(updated_at)s by %(updated_by)s."
-msgstr ""
-
 #: project/templates/_macros.html:346
 #, python-format
+msgid "Created at %(created_at)s by %(created_by)s."
+msgstr ""
+
+#: project/templates/_macros.html:348
+#, python-format
+msgid "Created at %(created_at)s."
+msgstr ""
+
+#: project/templates/_macros.html:353
+#, python-format
+msgid "Last updated at %(updated_at)s by %(updated_by)s."
+msgstr ""
+
+#: project/templates/_macros.html:355
+#, python-format
 msgid "Last updated at %(updated_at)s."
 msgstr ""
 
-#: project/templates/_macros.html:376 project/templates/_macros.html:546
+#: project/templates/_macros.html:385 project/templates/_macros.html:555
 #: project/templates/event/actions.html:12
 #: project/templates/event/create.html:250
 #: project/templates/event/update.html:141
@@ -1173,58 +1173,58 @@ msgstr ""
 msgid "Event"
 msgstr ""
 
-#: project/templates/_macros.html:382 project/templates/_macros.html:908
+#: project/templates/_macros.html:391 project/templates/_macros.html:917
 msgid "Date"
 msgstr ""
 
-#: project/templates/_macros.html:409 project/templates/_macros.html:568
-#: project/templates/_macros.html:1464 project/templates/event/actions.html:32
+#: project/templates/_macros.html:418 project/templates/_macros.html:577
+#: project/templates/_macros.html:1473 project/templates/event/actions.html:32
 msgid "Share"
 msgstr ""
 
-#: project/templates/_macros.html:413 project/templates/_macros.html:572
-#: project/templates/_macros.html:1494
+#: project/templates/_macros.html:422 project/templates/_macros.html:581
+#: project/templates/_macros.html:1503
 msgid "Add to calendar"
 msgstr ""
 
-#: project/templates/_macros.html:421 project/templates/_macros.html:580
+#: project/templates/_macros.html:430 project/templates/_macros.html:589
 #: project/templates/event/report.html:4
 msgid "Report event"
 msgstr ""
 
-#: project/templates/_macros.html:448 project/templates/_macros.html:606
+#: project/templates/_macros.html:457 project/templates/_macros.html:615
 msgid "Show directions"
 msgstr ""
 
-#: project/templates/_macros.html:453 project/templates/_macros.html:611
+#: project/templates/_macros.html:462 project/templates/_macros.html:620
 msgid "The event takes place online."
 msgstr ""
 
-#: project/templates/_macros.html:455 project/templates/_macros.html:613
+#: project/templates/_macros.html:464 project/templates/_macros.html:622
 msgid "The event takes place both offline and online."
 msgstr ""
 
-#: project/templates/_macros.html:667 project/templates/event_date/list.html:5
-#: project/templates/event_date/list.html:300
+#: project/templates/_macros.html:676 project/templates/event_date/list.html:5
+#: project/templates/event_date/list.html:299
 #: project/templates/reference_request/review.html:32
 msgid "Event Dates"
 msgstr ""
 
-#: project/templates/_macros.html:759
+#: project/templates/_macros.html:768
 msgid "Search location on Google"
 msgstr ""
 
-#: project/templates/_macros.html:825
+#: project/templates/_macros.html:834
 #, python-format
 msgid "%(count)d event dates"
 msgstr ""
 
-#: project/templates/_macros.html:848 project/templates/_macros.html:850
+#: project/templates/_macros.html:857 project/templates/_macros.html:859
 #: project/templates/event_date/list.html:321
 msgid "First"
 msgstr ""
 
-#: project/templates/_macros.html:853 project/templates/_macros.html:855
+#: project/templates/_macros.html:862 project/templates/_macros.html:864
 #: project/templates/event_date/list.html:322
 #: project/templates/widget/event_suggestion/create.html:193
 #: project/templates/widget/event_suggestion/create.html:218
@@ -1235,12 +1235,12 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: project/templates/_macros.html:857
+#: project/templates/_macros.html:866
 #, python-format
 msgid "Page %(page)d of %(pages)d (%(total)d total)"
 msgstr ""
 
-#: project/templates/_macros.html:859 project/templates/_macros.html:861
+#: project/templates/_macros.html:868 project/templates/_macros.html:870
 #: project/templates/event_date/list.html:324
 #: project/templates/widget/event_suggestion/create.html:194
 #: project/templates/widget/event_suggestion/create.html:219
@@ -1250,77 +1250,77 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: project/templates/_macros.html:864 project/templates/_macros.html:866
+#: project/templates/_macros.html:873 project/templates/_macros.html:875
 #: project/templates/event_date/list.html:325
 msgid "Last"
 msgstr ""
 
-#: project/templates/_macros.html:931
+#: project/templates/_macros.html:940
 msgid "Radius"
 msgstr ""
 
-#: project/templates/_macros.html:1141
+#: project/templates/_macros.html:1150
 msgid "Edit image"
 msgstr ""
 
-#: project/templates/_macros.html:1162
+#: project/templates/_macros.html:1171
 msgid "Close"
 msgstr ""
 
-#: project/templates/_macros.html:1163
+#: project/templates/_macros.html:1172
 msgid "Okay"
 msgstr ""
 
-#: project/templates/_macros.html:1175
+#: project/templates/_macros.html:1184
 msgid "Choose image file"
 msgstr ""
 
-#: project/templates/_macros.html:1211 project/templates/event/actions.html:46
+#: project/templates/_macros.html:1220 project/templates/event/actions.html:46
 msgid "Edit event"
 msgstr ""
 
-#: project/templates/_macros.html:1214 project/templates/manage/events.html:45
+#: project/templates/_macros.html:1223 project/templates/manage/events.html:45
 msgid "More"
 msgstr ""
 
-#: project/templates/_macros.html:1261
+#: project/templates/_macros.html:1270
 msgid "Please enter a valid time, between 00:00 and 23:59."
 msgstr ""
 
-#: project/templates/_macros.html:1289
+#: project/templates/_macros.html:1298
 #, python-format
 msgid "Just use %(term)s"
 msgstr ""
 
-#: project/templates/_macros.html:1355
+#: project/templates/_macros.html:1364
 msgid "Event suggestion"
 msgstr ""
 
-#: project/templates/_macros.html:1473
+#: project/templates/_macros.html:1482
 msgid "Link copied"
 msgstr ""
 
-#: project/templates/_macros.html:1473
+#: project/templates/_macros.html:1482
 msgid "Copy link"
 msgstr ""
 
-#: project/templates/_macros.html:1502
+#: project/templates/_macros.html:1511
 msgid "Google calendar"
 msgstr ""
 
-#: project/templates/_macros.html:1503
+#: project/templates/_macros.html:1512
 msgid "Apple calendar"
 msgstr ""
 
-#: project/templates/_macros.html:1504
+#: project/templates/_macros.html:1513
 msgid "Yahoo calendar"
 msgstr ""
 
-#: project/templates/_macros.html:1505
+#: project/templates/_macros.html:1514
 msgid "Other calendar"
 msgstr ""
 
-#: project/templates/_macros.html:1700
+#: project/templates/_macros.html:1709
 msgid "Remove event date"
 msgstr ""
 
@@ -1688,6 +1688,14 @@ msgstr ""
 msgid "Request reference for event \"%(name)s\""
 msgstr ""
 
+#: project/templates/event_date/list.html:301
+msgid "Search"
+msgstr ""
+
+#: project/templates/event_date/list.html:302
+msgid "Map view"
+msgstr ""
+
 #: project/templates/event_suggestion/review.html:20
 #: project/templates/manage/reviews.html:19
 msgid "Review event suggestion"
@@ -1975,27 +1983,27 @@ msgstr ""
 msgid "Invitation successfully deleted"
 msgstr ""
 
-#: project/views/event.py:177
+#: project/views/event.py:178
 msgid "Event successfully published"
 msgstr ""
 
-#: project/views/event.py:179
+#: project/views/event.py:180
 msgid "Draft successfully saved"
 msgstr ""
 
-#: project/views/event.py:222
+#: project/views/event.py:223
 msgid "Event successfully updated"
 msgstr ""
 
-#: project/views/event.py:248
+#: project/views/event.py:249
 msgid "Event successfully deleted"
 msgstr ""
 
-#: project/views/event.py:403
+#: project/views/event.py:408
 msgid "Referenced event changed"
 msgstr ""
 
-#: project/views/event.py:426
+#: project/views/event.py:431
 msgid "New event report"
 msgstr ""
 
diff --git a/tests/seeder.py b/tests/seeder.py
index a18c074..a4a726d 100644
--- a/tests/seeder.py
+++ b/tests/seeder.py
@@ -270,6 +270,8 @@ class Seeder(object):
         start=None,
         allday=False,
         co_organizer_ids=None,
+        description="Beschreibung",
+        tags="",
     ):
         from project.models import (
             Event,
@@ -284,12 +286,12 @@ class Seeder(object):
             event.admin_unit_id = admin_unit_id
             event.categories = [upsert_event_category("Other")]
             event.name = name
-            event.description = ("Beschreibung",)
+            event.description = description
             event.event_place_id = self.upsert_default_event_place(admin_unit_id)
             event.organizer_id = self.upsert_default_event_organizer(admin_unit_id)
             event.external_link = external_link
             event.ticket_link = ""
-            event.tags = ""
+            event.tags = tags
             event.price_info = ""
             event.attendance_mode = EventAttendanceMode.offline
 
diff --git a/tests/services/test_event.py b/tests/services/test_event.py
index d689df1..0806256 100644
--- a/tests/services/test_event.py
+++ b/tests/services/test_event.py
@@ -1,3 +1,6 @@
+import pytest
+
+
 def test_update_event_dates_with_recurrence_rule(client, seeder, utils, app):
     user_id, admin_unit_id = seeder.setup_base()
     event_id = seeder.create_event(admin_unit_id)
@@ -206,3 +209,63 @@ def test_get_events_query(client, seeder, app):
         pagination = events.paginate()
 
         assert pagination.total == 1
+
+
+@pytest.mark.parametrize(
+    "index, event_descs, keyword, results, order",
+    [
+        (0, ("Führung durch Goslar", "Other"), "Goslar", 1, None),
+        (1, ("Führung durch Goslar", "Other"), "Führung", 1, None),
+        (2, ("Führung durch Goslar", "Other"), "Fuehrung", 0, None),
+        (3, ("Führung durch Goslar", "Other"), "Goslar Führung", 1, None),
+        (
+            4,
+            ("Führung durch Goslar", "Führung durch Soest"),
+            "Goslar Führung",
+            1,
+            None,
+        ),
+        (
+            5,
+            (
+                "Führung durch Goslar",
+                "Führung durch Soest",
+                "Führung durch Berlin",
+            ),
+            "Führung (Goslar OR Soest)",
+            2,
+            None,
+        ),
+    ],
+)
+def test_get_events_fulltext(
+    client, seeder, app, index, event_descs, keyword, results, order
+):
+    _, admin_unit_id = seeder.setup_base()
+
+    if type(event_descs) is not tuple:
+        event_descs = [event_descs]
+
+    event_ids = list()
+    for event_desc in event_descs:
+        event_id = seeder.create_event(admin_unit_id, name=event_desc)
+        event_ids.append(event_id)
+
+    with app.app_context():
+        from project.services.event import get_events_query
+        from project.services.event_search import EventSearchParams
+
+        params = EventSearchParams()
+        params.keyword = keyword
+        events = get_events_query(params)
+        pagination = events.paginate()
+
+        assert pagination.total == results
+
+        if not order:
+            order = range(0, len(event_descs) - 1)
+
+        i = 0
+        for item in pagination.items:
+            assert item.id == event_ids[order[i]]
+            i = i + 1