4 files changed, 21 insertions, 8 deletions

diff --git a/client/src/app/search/advanced-search.model.ts b/client/src/app/search/advanced-search.model.ts
index ce22c3f84..48616a9ae 100644
--- a/client/src/app/search/advanced-search.model.ts
+++ b/client/src/app/search/advanced-search.model.ts
@@ -99,14 +99,22 @@ export class AdvancedSearch {
       startDate: this.startDate,
       endDate: this.endDate,
       nsfw: this.nsfw,
-      categoryOneOf: this.categoryOneOf ? this.categoryOneOf.split(',') : undefined,
-      licenceOneOf: this.licenceOneOf ? this.licenceOneOf.split(',') : undefined,
-      languageOneOf: this.languageOneOf ? this.languageOneOf.split(',') : undefined,
-      tagsOneOf: this.tagsOneOf ? this.tagsOneOf.split(',') : undefined,
-      tagsAllOf: this.tagsAllOf ? this.tagsAllOf.split(',') : undefined,
+      categoryOneOf: this.intoArray(this.categoryOneOf),
+      licenceOneOf: this.intoArray(this.licenceOneOf),
+      languageOneOf: this.intoArray(this.languageOneOf),
+      tagsOneOf: this.intoArray(this.tagsOneOf),
+      tagsAllOf: this.intoArray(this.tagsAllOf),
       durationMin: this.durationMin,
       durationMax: this.durationMax,
       sort: this.sort
     }
   }
+
+  private intoArray (value: any) {
+    if (!value) return undefined
+
+    if (typeof value === 'string') return value.split(',')
+
+    return [ value ]
+  }
 }
diff --git a/client/src/app/search/search.component.html b/client/src/app/search/search.component.html
index a0b5e6e79..9d14daa4b 100644
--- a/client/src/app/search/search.component.html
+++ b/client/src/app/search/search.component.html
@@ -3,7 +3,10 @@
     <div class="first-line">
       <div class="results-counter">
         <ng-container *ngIf="pagination.totalItems">
-          {{ pagination.totalItems | myNumberFormatter }} results for <span class="search-value">{{ currentSearch }}</span>
+          {{ pagination.totalItems | myNumberFormatter }} results
+          <span *ngIf="currentSearch">
+            for <span class="search-value">{{ currentSearch }}</span>
+          </span>
         </ng-container>
       </div>
 
diff --git a/client/src/app/search/search.component.ts b/client/src/app/search/search.component.ts
index 8860b9268..8d615fd05 100644
--- a/client/src/app/search/search.component.ts
+++ b/client/src/app/search/search.component.ts
@@ -44,7 +44,8 @@ export class SearchComponent implements OnInit, OnDestroy {
       queryParams => {
         const querySearch = queryParams['search']
 
-        if (!querySearch) return this.redirectService.redirectToHomepage()
+        // New empty search
+        if (this.currentSearch && !querySearch) return this.redirectService.redirectToHomepage()
 
         // Search updated, reset filters
         if (this.currentSearch !== querySearch) {
diff --git a/client/src/app/search/search.service.ts b/client/src/app/search/search.service.ts
index b46cb97f4..a37c49161 100644
--- a/client/src/app/search/search.service.ts
+++ b/client/src/app/search/search.service.ts
@@ -36,7 +36,8 @@ export class SearchService {
 
     let params = new HttpParams()
     params = this.restService.addRestGetParams(params, pagination)
-    params = params.append('search', search)
+
+    if (search) params = params.append('search', search)
 
     const advancedSearchObject = advancedSearch.toAPIObject()