Persist event filter state across reload and navigation

contao/templates/frontend/event_filter.html.twig

@@ -2,8 +2,8 @@
     <div class="select-filters">
         <div class="widget-select category">
             <label for="tag-filter" class="visually-hidden">Kategorie wählen</label>
-            <select id="tag-filter">
+            <select id="tag-filter" placeholder="Kategorie wählen" autocomplete="off">
-                <option value="all" data-placeholder="true">Kategorie wählen</option>
+                <option value="">Kategorie wählen</option>
                 {% for tag in tagButtons|default([]) %}
                     <option value="tag-{{ tag.id }}">{{ tag.title }} ({{ tag.count }})</option>
                 {% endfor %}
@@ -12,8 +12,8 @@
 
         <div class="widget-select places">
             <label for="location-filter" class="visually-hidden">Ort wählen</label>
-            <select id="location-filter">
+            <select id="location-filter" placeholder="Ort wählen" autocomplete="off">
-                <option value="all" data-placeholder="true">Ort wählen</option>
+                <option value="">Ort wählen</option>
                 {% for location in locations|default([]) %}
                     <option value="location-{{ location.id }}">{{ location.title }} ({{ location.count }})</option>
                 {% endfor %}
@@ -22,8 +22,8 @@
 
         <div class="widget-select org">
             <label for="org-filter" class="visually-hidden">Veranstalter wählen</label>
-            <select id="org-filter">
+            <select id="org-filter" placeholder="Veranstalter wählen" autocomplete="off">
-                <option value="all" data-placeholder="true">Veranstalter wählen</option>
+                <option value="">Veranstalter wählen</option>
                 {% for organization in organizations|default([]) %}
                     <option value="org-{{ organization.id }}">{{ organization.title }} ({{ organization.count }})</option>
                 {% endfor %}
@@ -31,7 +31,7 @@
         </div>
     </div>
 
-    <button type="button" id="eventfilter-reset" class="eventfilter-reset" hidden>Filter zurücksetzen</button>
+    <button type="button" id="eventfilter-reset" class="eventfilter-reset" aria-label="Alle Filter zurücksetzen" aria-controls="{{ targetEventListId|default('eventlist')|e('html_attr') }}" hidden>Filter zurücksetzen</button>
 
     <p id="eventfilter-status" class="visually-hidden" aria-live="polite"></p>
 </div>
@@ -68,23 +68,36 @@
         pointer-events: none;
     }
 
-    #eventfilters .widget-select.active .ss-main {
+    #eventfilters .widget-select.active .ts-control {
-        outline: 2px solid currentColor;
+        outline: 3px solid currentColor;
-        outline-offset: 2px;
+        outline-offset: 3px;
     }
 
-    #eventfilters .ss-main:focus-visible {
+    #eventfilters .ts-control:focus-within {
-        outline: 2px solid currentColor;
+        outline: 3px solid currentColor;
-        outline-offset: 2px;
+        outline-offset: 3px;
     }
 
     #eventfilters .eventfilter-reset[hidden] {
         display: none;
     }
+
+    #eventfilters .ts-wrapper.single .ts-control {
+        background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath fill='none' stroke='%23343a40' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/%3E%3C/svg%3E");
+        background-repeat: no-repeat;
+        background-position: right 0.75rem center;
+        background-size: 16px 12px;
+        padding-right: 2rem;
+    }
+
+    #eventfilters .ts-wrapper.single .ts-control > input {
+        width: auto;
+    }
+
 </style>
 
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/slim-select@3/dist/slimselect.css">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tom-select@2/dist/css/tom-select.css">
-<script src="https://cdn.jsdelivr.net/npm/slim-select@3/dist/slimselect.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/tom-select@2/dist/js/tom-select.complete.min.js"></script>
 
 <script type="module">
     const filters = document.getElementById('eventfilters');
@@ -111,31 +124,170 @@
     const orgWidget = orgSelect?.closest('.widget-select');
     const resetButton = filters.querySelector('#eventfilter-reset');
     const status = filters.querySelector('#eventfilter-status');
+    const stateStorageKey = 'event-filter-state';
+    const stateQueryKey = 'event_filter';
 
     const animationMs = 220;
     let hideTimers = new WeakMap();
-    let currentFilter = { type: 'all', value: 'all' };
+    let currentFilter = { type: 'all', value: '' };
     let suppressedChangeEvents = 0;
 
-    const initSlimSelect = (selectElement) => {
+    const initTomSelect = (selectElement) => {
-        if (!selectElement || 'undefined' === typeof window.SlimSelect) {
+        if (!selectElement || 'undefined' === typeof window.TomSelect) {
             return null;
         }
 
-        return new window.SlimSelect({
+        let shouldBlurOnChange = false;
-            select: selectElement,
+
-            settings: {
+        return new window.TomSelect(selectElement, {
-                showSearch: false,
+            create: false,
-                allowDeselect: false,
+            sortField: {
+                field: 'text',
+                direction: 'asc',
+            },
+            render: {
+                no_results() {
+                    return '<div class="no-results" role="option" aria-disabled="true">Keine Ergebnisse gefunden</div>';
+                },
+                no_more_results() {
+                    return '<div class="no-more-results" role="option" aria-disabled="true">Keine weiteren Ergebnisse</div>';
+                },
+            },
+            onInitialize() {
+                const markPointerInteraction = () => {
+                    shouldBlurOnChange = true;
+                };
+
+                const markKeyboardInteraction = () => {
+                    shouldBlurOnChange = false;
+                };
+
+                this.control.addEventListener('pointerdown', markPointerInteraction);
+                this.control.addEventListener('touchstart', markPointerInteraction, { passive: true });
+                this.control.addEventListener('keydown', markKeyboardInteraction);
+                this.dropdown.addEventListener('pointerdown', markPointerInteraction);
+                this.dropdown.addEventListener('touchstart', markPointerInteraction, { passive: true });
+                this.dropdown.addEventListener('keydown', markKeyboardInteraction);
+            },
+            onChange() {
+                if (!shouldBlurOnChange) {
+                    return;
+                }
+
+                this.blur();
+                shouldBlurOnChange = false;
             },
         });
     };
 
-    const tagSlim = initSlimSelect(tagSelect);
+    const tagTom = initTomSelect(tagSelect);
-    const locationSlim = initSlimSelect(locationSelect);
+    const locationTom = initTomSelect(locationSelect);
-    const orgSlim = initSlimSelect(orgSelect);
+    const orgTom = initTomSelect(orgSelect);
 
-    const setSelectValue = (selectElement, slimInstance, value) => {
+    const hasOptionValue = (selectElement, value) => {
+        if (!selectElement) {
+            return false;
+        }
+
+        return Array.from(selectElement.options).some((option) => option.value === value);
+    };
+
+    const rawValueToFilterState = (rawValue) => {
+        const value = (rawValue || '').trim();
+
+        if (!value) {
+            return { type: 'all', value: '' };
+        }
+
+        if (value.startsWith('tag-') && hasOptionValue(tagSelect, value)) {
+            return { type: 'tag', value: value.replace('tag-', '') };
+        }
+
+        if (value.startsWith('location-') && hasOptionValue(locationSelect, value)) {
+            return { type: 'location', value: value.replace('location-', '') };
+        }
+
+        if (value.startsWith('org-') && hasOptionValue(orgSelect, value)) {
+            return { type: 'org', value: value.replace('org-', '') };
+        }
+
+        return { type: 'all', value: '' };
+    };
+
+    const filterStateToRawValue = (filterState) => {
+        if (!filterState.value || filterState.type === 'all') {
+            return '';
+        }
+
+        if (filterState.type === 'tag') {
+            return `tag-${filterState.value}`;
+        }
+
+        if (filterState.type === 'location') {
+            return `location-${filterState.value}`;
+        }
+
+        if (filterState.type === 'org') {
+            return `org-${filterState.value}`;
+        }
+
+        return '';
+    };
+
+    const readUrlState = () => {
+        const url = new URL(window.location.href);
+        return (url.searchParams.get(stateQueryKey) || '').trim();
+    };
+
+    const writeUrlState = (value) => {
+        const url = new URL(window.location.href);
+
+        if (value) {
+            url.searchParams.set(stateQueryKey, value);
+        } else {
+            url.searchParams.delete(stateQueryKey);
+        }
+
+        window.history.replaceState(window.history.state, '', url);
+    };
+
+    const readStoredState = () => {
+        try {
+            return (window.sessionStorage.getItem(stateStorageKey) || '').trim();
+        } catch (error) {
+            return '';
+        }
+    };
+
+    const writeStoredState = (value) => {
+        try {
+            if (value) {
+                window.sessionStorage.setItem(stateStorageKey, value);
+            } else {
+                window.sessionStorage.removeItem(stateStorageKey);
+            }
+        } catch (error) {
+            // noop
+        }
+    };
+
+    const syncState = (filterState) => {
+        const rawValue = filterStateToRawValue(filterState);
+        writeStoredState(rawValue);
+        writeUrlState(rawValue);
+    };
+
+    const applyControlState = (filterState) => {
+        const tagValue = filterState.type === 'tag' ? `tag-${filterState.value}` : '';
+        const locationValue = filterState.type === 'location' ? `location-${filterState.value}` : '';
+        const orgValue = filterState.type === 'org' ? `org-${filterState.value}` : '';
+
+        setSelectValue(tagSelect, tagTom, tagValue);
+        setSelectValue(locationSelect, locationTom, locationValue);
+        setSelectValue(orgSelect, orgTom, orgValue);
+    };
+
+    const setSelectValue = (selectElement, tomInstance, value) => {
         if (!selectElement) {
             return;
         }
@@ -147,8 +299,8 @@
         suppressedChangeEvents += 1;
 
         try {
-            if (slimInstance) {
+            if (tomInstance) {
-                slimInstance.setSelected(value);
+                tomInstance.setValue(value, true);
             } else {
                 selectElement.value = value;
             }
@@ -190,9 +342,9 @@
     };
 
     const setActiveControl = ({ type, value }) => {
-        const hasActiveTag = type === 'tag' && value !== 'all';
+        const hasActiveTag = type === 'tag' && Boolean(value);
-        const hasActiveLocation = type === 'location' && value !== 'all';
+        const hasActiveLocation = type === 'location' && Boolean(value);
-        const hasActiveOrg = type === 'org' && value !== 'all';
+        const hasActiveOrg = type === 'org' && Boolean(value);
 
         tagWidget?.classList.toggle('active', hasActiveTag);
         locationWidget?.classList.toggle('active', hasActiveLocation);
@@ -209,7 +361,7 @@
         .filter(Boolean);
 
     const matches = (eventItem, filterState) => {
-        if (filterState.value === 'all') {
+        if (!filterState.value || filterState.type === 'all') {
             return true;
         }
 
@@ -225,10 +377,6 @@
             return parseIdList(eventItem.dataset.org).includes(filterState.value);
         }
 
-        if (filterState.type === 'all') {
-            return true;
-        }
-
         return true;
     };
 
@@ -271,6 +419,7 @@
         });
 
         updateStatus(filterState);
+        syncState(filterState);
     };
 
     tagSelect?.addEventListener('change', () => {
@@ -280,12 +429,12 @@
 
         const selectedValue = tagSelect.value;
 
-        setSelectValue(locationSelect, locationSlim, 'all');
+        setSelectValue(locationSelect, locationTom, '');
-        setSelectValue(orgSelect, orgSlim, 'all');
+        setSelectValue(orgSelect, orgTom, '');
 
         applyFilter(
-            selectedValue === 'all'
+            !selectedValue
-                ? { type: 'all', value: 'all' }
+                ? { type: 'all', value: '' }
                 : { type: 'tag', value: selectedValue.replace('tag-', '') },
         );
     });
@@ -297,12 +446,12 @@
 
         const selectedValue = locationSelect.value;
 
-        setSelectValue(tagSelect, tagSlim, 'all');
+        setSelectValue(tagSelect, tagTom, '');
-        setSelectValue(orgSelect, orgSlim, 'all');
+        setSelectValue(orgSelect, orgTom, '');
 
         applyFilter(
-            selectedValue === 'all'
+            !selectedValue
-                ? { type: 'all', value: 'all' }
+                ? { type: 'all', value: '' }
                 : { type: 'location', value: selectedValue.replace('location-', '') },
         );
     });
@@ -314,23 +463,34 @@
 
         const selectedValue = orgSelect.value;
 
-        setSelectValue(tagSelect, tagSlim, 'all');
+        setSelectValue(tagSelect, tagTom, '');
-        setSelectValue(locationSelect, locationSlim, 'all');
+        setSelectValue(locationSelect, locationTom, '');
 
         applyFilter(
-            selectedValue === 'all'
+            !selectedValue
-                ? { type: 'all', value: 'all' }
+                ? { type: 'all', value: '' }
                 : { type: 'org', value: selectedValue.replace('org-', '') },
         );
     });
 
     resetButton?.addEventListener('click', () => {
-        setSelectValue(tagSelect, tagSlim, 'all');
+        setSelectValue(tagSelect, tagTom, '');
-        setSelectValue(locationSelect, locationSlim, 'all');
+        setSelectValue(locationSelect, locationTom, '');
-        setSelectValue(orgSelect, orgSlim, 'all');
+        setSelectValue(orgSelect, orgTom, '');
 
-        applyFilter({ type: 'all', value: 'all' });
+        applyFilter({ type: 'all', value: '' });
     });
 
-    applyFilter(currentFilter);
+    const urlState = readUrlState();
+    const storedState = readStoredState();
+    const initialState = rawValueToFilterState(urlState || storedState);
+
+    applyControlState(initialState);
+    applyFilter(initialState);
+
+    window.addEventListener('popstate', () => {
+        const stateFromUrl = rawValueToFilterState(readUrlState());
+        applyControlState(stateFromUrl);
+        applyFilter(stateFromUrl);
+    });
 </script>

src/EventListener/OrganizationListingTemplateDataListener.php

@@ -17,7 +17,7 @@ class OrganizationListingTemplateDataListener
 {
     public function __construct(
         private readonly Connection $connection,
-        private readonly LoggerInterface $logger,
+        private readonly ?LoggerInterface $logger = null,
     ) {
     }
 
@@ -34,11 +34,6 @@ class OrganizationListingTemplateDataListener
         }
 
         $rowToOrganizationIdMap = [];
-        $rowToTitleMap = [];
-
-        $resolvedByRowIdCount = 0;
-        $resolvedByTitleToIdCount = 0;
-        $enrichedByTitleTagFallbackCount = 0;
 
         foreach ($tbody as $rowIndex => $row) {
             if (!\is_array($row)) {
@@ -49,31 +44,6 @@ class OrganizationListingTemplateDataListener
 
             if ($organizationId > 0) {
                 $rowToOrganizationIdMap[(int) $rowIndex] = $organizationId;
-                ++$resolvedByRowIdCount;
-                continue;
-            }
-
-            $title = $this->extractRowFieldContent($row, 'title');
-
-            if ('' !== $title) {
-                $rowToTitleMap[(int) $rowIndex] = $this->normalizeTitle($title);
-            }
-        }
-
-        if ([] !== $rowToTitleMap) {
-            $titleToOrganizationIdMap = $this->resolveOrganizationIdsByTitle(array_values(array_unique(array_filter($rowToTitleMap))));
-
-            foreach ($rowToTitleMap as $rowIndex => $title) {
-                if (isset($rowToOrganizationIdMap[$rowIndex])) {
-                    continue;
-                }
-
-                $organizationId = $titleToOrganizationIdMap[$title] ?? 0;
-
-                if ($organizationId > 0) {
-                    $rowToOrganizationIdMap[$rowIndex] = $organizationId;
-                    ++$resolvedByTitleToIdCount;
-                }
             }
         }
 
@@ -81,82 +51,78 @@ class OrganizationListingTemplateDataListener
             return;
         }
 
-        $organizationTagMap = $this->fetchOrganizationTagMap(array_values(array_unique(array_values($rowToOrganizationIdMap))));
+        $organizationIds = array_values(array_unique(array_values($rowToOrganizationIdMap)));
-        $organizationLogoUuidMap = $this->fetchOrganizationLogoUuidMap(array_values(array_unique(array_values($rowToOrganizationIdMap))));
+        $organizationTagMap = $this->fetchOrganizationTagMap($organizationIds);
-        $organizationTagMapByTitle = $this->fetchOrganizationTagMapByTitle(array_values(array_unique(array_filter($rowToTitleMap))));
+        $organizationLogoMap = $this->fetchOrganizationLogoMap($organizationIds);
+
+        $organizationTagLabelMap = [];
+        $rowTagIdsList = [];
+
+        foreach ($organizationTagMap as $tagData) {
+            foreach (($tagData['ids'] ?? []) as $index => $tagId) {
+                $label = trim((string) (($tagData['labels'][$index] ?? '') ?: ''));
+
+                if ('' !== $tagId && '' !== $label && !isset($organizationTagLabelMap[(string) $tagId])) {
+                    $organizationTagLabelMap[(string) $tagId] = $label;
+                }
+            }
+        }
 
         foreach ($rowToOrganizationIdMap as $rowIndex => $organizationId) {
-            $tagData = $organizationTagMap[$organizationId] ?? ['labels' => [], 'slugs' => []];
-            $logoUuid = $organizationLogoUuidMap[$organizationId] ?? '';
-
             if (!isset($tbody[$rowIndex]) || !\is_array($tbody[$rowIndex])) {
                 continue;
             }
 
-            $tbody[$rowIndex]['tag_labels']['content'] = implode(', ', $tagData['labels']);
+            $tagData = $organizationTagMap[$organizationId] ?? ['ids' => [], 'labels' => []];
-            $tbody[$rowIndex]['tag_slugs']['content'] = implode(',', $tagData['slugs']);
+            $logoData = $organizationLogoMap[$organizationId] ?? ['uuid' => '', 'isSvg' => false];
-            $tbody[$rowIndex]['tags']['content'] = implode(', ', $tagData['labels']);
+            $logoUuid = (string) ($logoData['uuid'] ?? '');
+            $logoIsSvg = (bool) ($logoData['isSvg'] ?? false);
+            $tagIdsCsv = implode(',', $tagData['ids']);
+            $tagLabelsCsv = implode(', ', $tagData['labels']);
+
+            $tbody[$rowIndex]['tag_ids']['content'] = $tagIdsCsv;
+            $tbody[$rowIndex]['tag_labels']['content'] = $tagLabelsCsv;
+            $tbody[$rowIndex]['tags']['content'] = $tagLabelsCsv;
 
             if ('' !== $logoUuid) {
                 $tbody[$rowIndex]['logo_uuid']['content'] = $logoUuid;
+                $tbody[$rowIndex]['logo_is_svg']['content'] = $logoIsSvg ? '1' : '';
             }
         }
 
         foreach ($tbody as $rowIndex => $row) {
-            if (!\is_array($row) || isset($rowToOrganizationIdMap[$rowIndex])) {
-                continue;
-            }
-
-            $title = $this->normalizeTitle($this->extractRowFieldContent($row, 'title'));
-
-            if ('' === $title || !isset($organizationTagMapByTitle[$title])) {
-                continue;
-            }
-
-            $tagData = $organizationTagMapByTitle[$title];
-
-            $tbody[$rowIndex]['tag_labels']['content'] = implode(', ', $tagData['labels']);
-            $tbody[$rowIndex]['tag_slugs']['content'] = implode(',', $tagData['slugs']);
-            $tbody[$rowIndex]['tags']['content'] = implode(', ', $tagData['labels']);
-            ++$enrichedByTitleTagFallbackCount;
-        }
-
-        $rowsWithoutTagSlugs = 0;
-        $sampleUnresolvedTitles = [];
-
-        foreach ($tbody as $row) {
             if (!\is_array($row)) {
+                $rowTagIdsList[] = '';
                 continue;
             }
 
-            $tagSlugs = $this->extractRowFieldContent($row, 'tag_slugs');
+            $organizationId = $rowToOrganizationIdMap[(int) $rowIndex] ?? 0;
-
+            $rowTagIdsList[] = ($organizationId > 0 && isset($organizationTagMap[$organizationId]))
-            if ('' !== $tagSlugs) {
+                ? implode(',', $organizationTagMap[$organizationId]['ids'] ?? [])
-                continue;
+                : '';
         }
 
-            ++$rowsWithoutTagSlugs;
+        if (null !== $this->logger) {
+            $rowsWithoutTagIds = 0;
 
-            if (\count($sampleUnresolvedTitles) < 10) {
+            foreach ($rowToOrganizationIdMap as $organizationId) {
-                $title = $this->normalizeTitle($this->extractRowFieldContent($row, 'title'));
+                if (!isset($organizationTagMap[$organizationId]) || [] === ($organizationTagMap[$organizationId]['ids'] ?? [])) {
-
+                    ++$rowsWithoutTagIds;
-                if ('' !== $title) {
-                    $sampleUnresolvedTitles[] = $title;
-                }
                 }
             }
 
-        if ($rowsWithoutTagSlugs > 0) {
+            if ($rowsWithoutTagIds > 0) {
-            $this->logger->warning('Organization listing tag enrichment left rows without tag slugs.', [
+                $this->logger->warning('Organization listing enrichment found rows without tag IDs.', [
                     'template' => (string) $template->getName(),
                     'totalRows' => \count($tbody),
-                'resolvedByRowId' => $resolvedByRowIdCount,
+                    'mappedRows' => \count($rowToOrganizationIdMap),
-                'resolvedByTitleToId' => $resolvedByTitleToIdCount,
+                    'rowsWithoutTagIds' => $rowsWithoutTagIds,
-                'enrichedByTitleTagFallback' => $enrichedByTitleTagFallbackCount,
-                'rowsWithoutTagSlugs' => $rowsWithoutTagSlugs,
-                'sampleUnresolvedTitles' => array_values(array_unique($sampleUnresolvedTitles)),
                 ]);
             }
+        }
+
+        $template->organization_tag_label_map = $organizationTagLabelMap;
+        $template->organization_row_tag_ids_list = $rowTagIdsList;
 
         $template->tbody = $tbody;
     }
@@ -165,6 +131,10 @@ class OrganizationListingTemplateDataListener
     private function extractOrganizationId(array $row): int
     {
         foreach (['id', 'organization_id', 'org_id'] as $fieldName) {
+            if (isset($row[$fieldName]) && \is_scalar($row[$fieldName]) && ctype_digit((string) $row[$fieldName])) {
+                return (int) $row[$fieldName];
+            }
+
             $value = $this->extractRowFieldContent($row, $fieldName);
 
             if ('' !== $value && ctype_digit($value)) {
@@ -172,29 +142,23 @@ class OrganizationListingTemplateDataListener
             }
         }
 
-        $urlCandidates = [];
-
         foreach ($row as $column) {
             if (!\is_array($column)) {
                 continue;
             }
 
-            if (isset($column['url']) && \is_scalar($column['url'])) {
+            foreach (['url', 'href'] as $urlField) {
-                $urlCandidates[] = (string) $column['url'];
+                if (!isset($column[$urlField]) || !\is_scalar($column[$urlField])) {
+                    continue;
                 }
 
-            if (isset($column['href']) && \is_scalar($column['href'])) {
+                $organizationId = $this->extractIdFromUrl((string) $column[$urlField]);
-                $urlCandidates[] = (string) $column['href'];
-            }
-        }
-
-        foreach ($urlCandidates as $url) {
-            $organizationId = $this->extractIdFromUrl($url);
 
                 if ($organizationId > 0) {
                     return $organizationId;
                 }
             }
+        }
 
         return 0;
     }
@@ -202,7 +166,15 @@ class OrganizationListingTemplateDataListener
     /** @param array<string, mixed> $row */
     private function extractRowFieldContent(array $row, string $fieldName): string
     {
-        if (!isset($row[$fieldName]) || !\is_array($row[$fieldName])) {
+        if (!isset($row[$fieldName])) {
+            return '';
+        }
+
+        if (\is_scalar($row[$fieldName])) {
+            return trim((string) $row[$fieldName]);
+        }
+
+        if (!\is_array($row[$fieldName])) {
             return '';
         }
 
@@ -240,57 +212,8 @@ class OrganizationListingTemplateDataListener
         return 0;
     }
 
-    /** @param list<string> $titles
-     *  @return array<string, int>
-     */
-    private function resolveOrganizationIdsByTitle(array $titles): array
-    {
-        if ([] === $titles) {
-            return [];
-        }
-
-        $rows = $this->connection->executeQuery(
-            'SELECT o.id, o.title FROM tl_organization o WHERE o.title IN (?)',
-            [$titles],
-            [ArrayParameterType::STRING],
-        )->fetchAllAssociative();
-
-        $titleToIdsMap = [];
-
-        foreach ($rows as $row) {
-            $organizationId = (int) ($row['id'] ?? 0);
-            $title = $this->normalizeTitle((string) ($row['title'] ?? ''));
-
-            if ($organizationId <= 0 || '' === $title) {
-                continue;
-            }
-
-            $titleToIdsMap[$title][] = $organizationId;
-        }
-
-        $titleToOrganizationIdMap = [];
-
-        foreach ($titleToIdsMap as $title => $organizationIds) {
-            $organizationIds = array_values(array_unique(array_map('intval', $organizationIds)));
-
-            if (1 === \count($organizationIds)) {
-                $titleToOrganizationIdMap[$title] = $organizationIds[0];
-            }
-        }
-
-        return $titleToOrganizationIdMap;
-    }
-
-    private function normalizeTitle(string $title): string
-    {
-        $title = html_entity_decode($title, ENT_QUOTES | ENT_HTML5, 'UTF-8');
-        $title = trim(strip_tags($title));
-
-        return preg_replace('/\s+/u', ' ', $title) ?? '';
-    }
-
     /** @param list<int> $organizationIds
-     *  @return array<int, array{labels: list<string>, slugs: list<string>}>
+     *  @return array<int, array{ids: list<string>, labels: list<string>}>
      */
     private function fetchOrganizationTagMap(array $organizationIds): array
     {
@@ -299,14 +222,22 @@ class OrganizationListingTemplateDataListener
         }
 
         $rows = $this->connection->executeQuery(
-            'SELECT r.pid AS organization_id, r.tag_id, t.tag AS label FROM tl_tags_rel r INNER JOIN tl_tags t ON t.id = r.tag_id WHERE r.ptable = ? AND r.field = ? AND r.pid IN (?) ORDER BY r.pid ASC, r.tag_id ASC',
+            'SELECT r.pid AS organization_id, r.tag_id, t.tag AS label
+             FROM tl_tags_rel r
+             INNER JOIN tl_tags t ON t.id = r.tag_id
+             WHERE r.ptable = ? AND r.field = ? AND r.pid IN (?)
+             ORDER BY r.pid ASC, r.tag_id ASC',
             ['tl_organization', 'tags', $organizationIds],
             [ParameterType::STRING, ParameterType::STRING, ArrayParameterType::INTEGER],
         )->fetchAllAssociative();
 
         if ([] === $rows) {
             $rows = $this->connection->executeQuery(
-                'SELECT r.pid AS organization_id, r.tag_id, t.tag AS label FROM tl_tags_rel r INNER JOIN tl_tags t ON t.id = r.tag_id WHERE r.ptable = ? AND r.pid IN (?) ORDER BY r.pid ASC, r.tag_id ASC',
+                'SELECT r.pid AS organization_id, r.tag_id, t.tag AS label
+                 FROM tl_tags_rel r
+                 INNER JOIN tl_tags t ON t.id = r.tag_id
+                 WHERE r.ptable = ? AND r.pid IN (?)
+                 ORDER BY r.pid ASC, r.tag_id ASC',
                 ['tl_organization', $organizationIds],
                 [ParameterType::STRING, ArrayParameterType::INTEGER],
             )->fetchAllAssociative();
@@ -320,92 +251,37 @@ class OrganizationListingTemplateDataListener
             $tagId = (int) ($row['tag_id'] ?? 0);
             $label = trim((string) ($row['label'] ?? ''));
 
-            if ($organizationId <= 0 || $tagId <= 0 || '' === $label) {
+            if ($organizationId <= 0 || $tagId <= 0 || '' === $label || isset($seen[$organizationId][$tagId])) {
-                continue;
-            }
-
-            if (isset($seen[$organizationId][$tagId])) {
                 continue;
             }
 
             $seen[$organizationId][$tagId] = true;
+            $map[$organizationId]['ids'][] = (string) $tagId;
             $map[$organizationId]['labels'][] = $label;
-
-            $slug = $this->slugify($label);
-
-            if ('' !== $slug) {
-                $map[$organizationId]['slugs'][] = $slug;
-            }
         }
 
         foreach ($map as $organizationId => $tagData) {
+            $map[$organizationId]['ids'] = array_values(array_unique($tagData['ids'] ?? []));
             $map[$organizationId]['labels'] = array_values(array_unique($tagData['labels'] ?? []));
-            $map[$organizationId]['slugs'] = array_values(array_unique($tagData['slugs'] ?? []));
-        }
-
-        return $map;
-    }
-
-    /** @param list<string> $titles
-     *  @return array<string, array{labels: list<string>, slugs: list<string>}>
-     */
-    private function fetchOrganizationTagMapByTitle(array $titles): array
-    {
-        if ([] === $titles) {
-            return [];
-        }
-
-        $rows = $this->connection->executeQuery(
-            'SELECT o.title, r.tag_id, t.tag AS label FROM tl_organization o INNER JOIN tl_tags_rel r ON r.pid = o.id AND r.ptable = ? INNER JOIN tl_tags t ON t.id = r.tag_id WHERE o.title IN (?) ORDER BY o.title ASC, r.tag_id ASC',
-            ['tl_organization', $titles],
-            [ParameterType::STRING, ArrayParameterType::STRING],
-        )->fetchAllAssociative();
-
-        $map = [];
-        $seen = [];
-
-        foreach ($rows as $row) {
-            $title = $this->normalizeTitle((string) ($row['title'] ?? ''));
-            $tagId = (int) ($row['tag_id'] ?? 0);
-            $label = trim((string) ($row['label'] ?? ''));
-
-            if ('' === $title || $tagId <= 0 || '' === $label) {
-                continue;
-            }
-
-            if (isset($seen[$title][$tagId])) {
-                continue;
-            }
-
-            $seen[$title][$tagId] = true;
-            $map[$title]['labels'][] = $label;
-
-            $slug = $this->slugify($label);
-
-            if ('' !== $slug) {
-                $map[$title]['slugs'][] = $slug;
-            }
-        }
-
-        foreach ($map as $title => $tagData) {
-            $map[$title]['labels'] = array_values(array_unique($tagData['labels'] ?? []));
-            $map[$title]['slugs'] = array_values(array_unique($tagData['slugs'] ?? []));
         }
 
         return $map;
     }
 
     /** @param list<int> $organizationIds
-     *  @return array<int, string>
+     *  @return array<int, array{uuid: string, isSvg: bool}>
      */
-    private function fetchOrganizationLogoUuidMap(array $organizationIds): array
+    private function fetchOrganizationLogoMap(array $organizationIds): array
     {
         if ([] === $organizationIds) {
             return [];
         }
 
         $rows = $this->connection->executeQuery(
-            'SELECT o.id AS organization_id, o.logo AS logo_uuid FROM tl_organization o WHERE o.id IN (?)',
+            'SELECT o.id AS organization_id, o.logo AS logo_uuid, f.extension AS file_extension, f.path AS file_path
+             FROM tl_organization o
+             LEFT JOIN tl_files f ON f.uuid = o.logo
+             WHERE o.id IN (?)',
             [$organizationIds],
             [ArrayParameterType::INTEGER],
         )->fetchAllAssociative();
@@ -415,12 +291,22 @@ class OrganizationListingTemplateDataListener
         foreach ($rows as $row) {
             $organizationId = (int) ($row['organization_id'] ?? 0);
             $logoUuid = $this->normalizeUuid($row['logo_uuid'] ?? null);
+            $extension = strtolower(trim((string) ($row['file_extension'] ?? '')));
+
+            if ('' === $extension && isset($row['file_path']) && \is_scalar($row['file_path'])) {
+                $extension = strtolower((string) pathinfo((string) $row['file_path'], PATHINFO_EXTENSION));
+            }
+
+            $isSvg = 'svg' === $extension;
 
             if ($organizationId <= 0 || '' === $logoUuid) {
                 continue;
             }
 
-            $map[$organizationId] = $logoUuid;
+            $map[$organizationId] = [
+                'uuid' => $logoUuid,
+                'isSvg' => $isSvg,
+            ];
         }
 
         return $map;
@@ -453,24 +339,4 @@ class OrganizationListingTemplateDataListener
         return '';
     }
 
-    private function slugify(string $value): string
-    {
-        $value = trim(mb_strtolower($value));
-
-        if ('' === $value) {
-            return '';
-        }
-
-        $value = strtr($value, [
-            'ä' => 'ae',
-            'ö' => 'oe',
-            'ü' => 'ue',
-            'ß' => 'ss',
-        ]);
-
-        $value = preg_replace('/[^a-z0-9]+/u', '-', $value) ?? '';
-        $value = trim($value, '-');
-
-        return $value;
-    }
 }