diff --git a/Classes/Domain/Repository/SearchRepository.php b/Classes/Domain/Repository/SearchRepository.php
index 721d14af..9670a50b 100644
--- a/Classes/Domain/Repository/SearchRepository.php
+++ b/Classes/Domain/Repository/SearchRepository.php
@@ -123,6 +123,7 @@ protected function extendWithExtendedFilterQuery(
             if ($filter->isDomainSet()) {
                 $logicalAnd[] = $query->equals('pagevisit.domain', $filter->getDomain());
             }
+            $logicalAnd[] = $query->in('pagevisit.site', $filter->getSitesForFilter());
         }
         return $logicalAnd;
     }
diff --git a/Resources/Private/Partials/Filter/Analysis/Search.html b/Resources/Private/Partials/Filter/Analysis/Search.html
index 72e76dce..262034d1 100644
--- a/Resources/Private/Partials/Filter/Analysis/Search.html
+++ b/Resources/Private/Partials/Filter/Analysis/Search.html
@@ -21,30 +21,34 @@ <h5><f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:mo
                     </div>
 
                     <div class="input-group form-group">
-                        <f:form.textfield
-                            type="datetime-local"
-                            property="timeFrom"
-                            id="timeFrom"
-                            class="form-control" />
-                        <button type="button" class="btn btn-default" data-global-event="click" data-action-focus="#timeFrom">
-                            {f:translate(key:'LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.list.filter.timeFrom')}
+                        <f:form.select
+                            id="site"
+                            class="form-control form-select"
+                            property="site"
+                            options="{filter.allowedSites}"
+                            prependOptionLabel="{f:translate(key:'LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.analysis.dashboard.filter.sitesall')}"
+                            prependOptionValue=""
+                            optionValueField="identifier"
+                            optionLabelField="configuration.websiteTitle"
+                            value="{filter.site}" />
+                        <button type="button" class="btn btn-default" data-global-event="click" data-action-focus="#site">
+                            <core:icon identifier="actions-globe" size="small" />
                         </button>
                     </div>
                 </div>
 
 
                 <div class="col-md-4">
-                    <h5><f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.list.filter.header.scoring">Scoring</f:translate></h5>
+                    <h5><f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:dictionary.time">Zeit</f:translate></h5>
 
                     <div class="input-group form-group">
                         <f:form.textfield
-                                type="range"
-                                property="scoring"
-                                class="form-control"
-                                additionalAttributes="{min:0, max:200, onchange:'document.getElementById(\'scoring_label\').innerHTML = this.value;'}"
-                                id="scoring"/>
-                        <button type="button" class="btn btn-default" data-global-event="click" data-action-focus="#scoring">
-                            Min: <strong id="scoring_label">{filter.scoring}</strong>
+                            type="datetime-local"
+                            property="timeFrom"
+                            id="timeFrom"
+                            class="form-control" />
+                        <button type="button" class="btn btn-default" data-global-event="click" data-action-focus="#timeFrom">
+                            {f:translate(key:'LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.list.filter.timeFrom')}
                         </button>
                     </div>
 
@@ -62,7 +66,19 @@ <h5><f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:mo
 
 
                 <div class="col-md-4">
-                    <h5><f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.list.filter.header.categoryscoring">Category</f:translate></h5>
+                    <h5>Scoring</h5>
+
+                    <div class="input-group form-group">
+                        <f:form.textfield
+                            type="range"
+                            property="scoring"
+                            class="form-control"
+                            additionalAttributes="{min:0, max:200, onchange:'document.getElementById(\'scoring_label\').innerHTML = this.value;'}"
+                            id="scoring"/>
+                        <button type="button" class="btn btn-default" data-global-event="click" data-action-focus="#scoring">
+                            Min: <strong id="scoring_label">{filter.scoring}</strong>
+                        </button>
+                    </div>
 
                     <div class="input-group form-group">
                         <f:form.select
@@ -78,41 +94,23 @@ <h5><f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:mo
                             <core:icon identifier="actions-tag" />
                         </button>
                     </div>
-
-                    <f:if condition="{domains -> f:count()} > 0">
-                        <div class="input-group form-group">
-                            <f:form.select property="domain" class="form-control form-select" id="domain">
-                                <f:form.select.option value="">
-                                    <f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.list.filter.firstoption.domain">Domain</f:translate>
-                                </f:form.select.option>
-                                <f:for each="{domains}" as="domain">
-                                    <f:form.select.option value="{domain}">{domain}</f:form.select.option>
-                                </f:for>
-                            </f:form.select>
-                            <label class="btn btn-default" for="domain">
-                                <span class="fa fa-globe"></span>
-                            </label>
-                        </div>
-                    </f:if>
                 </div>
             </div>
 
 
             <div class="row">
-                <div class="col-md-12">
-                    <div class="input-group form-group pull-right" style="display: block; width: auto;">
-                        <f:comment>Clear filter</f:comment>
-                        <f:if condition="{filter.set}">
-                            <f:link.action class="btn btn-default" style="margin-right: 10px" action="resetFilter" arguments="{redirectAction:view.action}">
-                                <f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.list.filter.reset">Reset</f:translate>
-                            </f:link.action>
-                        </f:if>
+                <div class="col-md-12" style="display: flex; justify-content: right;">
+                    <f:comment>Clear filter</f:comment>
+                    <f:if condition="{filter.set}">
+                        <f:link.action class="btn btn-default" style="margin-right: 10px" action="resetFilter" arguments="{redirectAction:view.action}">
+                            <f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.list.filter.reset">Reset</f:translate>
+                        </f:link.action>
+                    </f:if>
 
-                        <f:comment>Submit filter</f:comment>
-                        <f:form.submit
-                            class="btn btn-primary"
-                            value="{f:translate(key:'LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.list.filter.submit')}" />
-                    </div>
+                    <f:comment>Submit filter</f:comment>
+                    <f:form.submit
+                        class="btn btn-primary"
+                        value="{f:translate(key:'LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.list.filter.submit')}" />
                 </div>
             </div>
         </f:form>