diff --git a/src/common/entities/SearchQueryDTO.ts b/src/common/entities/SearchQueryDTO.ts
index dc0d4203..550347f7 100644
--- a/src/common/entities/SearchQueryDTO.ts
+++ b/src/common/entities/SearchQueryDTO.ts
@@ -90,6 +90,80 @@ export namespace SearchQueryDTO {
 
       case SearchQueryTypes.SOME_OF:
         throw new Error('Some of not supported');
+
+      default:
+        throw new Error('Unknown type' + query.type);
+    }
+  };
+  export const stringify = (query: SearchQueryDTO): string => {
+    if (!query || !query.type) {
+      return '';
+    }
+    switch (query.type) {
+      case SearchQueryTypes.AND:
+        return '(' + (<SearchListQuery>query).list.map(q => SearchQueryDTO.stringify(q)).join(' AND ') + ')';
+
+      case SearchQueryTypes.OR:
+        return '(' + (<SearchListQuery>query).list.map(q => SearchQueryDTO.stringify(q)).join(' OR ') + ')';
+
+      case SearchQueryTypes.SOME_OF:
+        if ((<SomeOfSearchQuery>query).min) {
+          return (<SomeOfSearchQuery>query).min + ' OF: (' +
+            (<SearchListQuery>query).list.map(q => SearchQueryDTO.stringify(q)).join(', ') + ')';
+        }
+        return 'SOME OF: (' +
+          (<SearchListQuery>query).list.map(q => SearchQueryDTO.stringify(q)).join(', ') + ')';
+
+
+      case SearchQueryTypes.orientation:
+        return 'orientation: ' + (<OrientationSearch>query).landscape ? 'landscape' : 'portrait';
+
+      case SearchQueryTypes.date:
+        let ret = '';
+        if ((<DateSearch>query).after) {
+          ret += 'from: ' + (<DateSearch>query).after;
+        }
+        if ((<DateSearch>query).before) {
+          ret += ' to: ' + (<DateSearch>query).before;
+        }
+        return ret.trim();
+      case SearchQueryTypes.rating:
+        let rating = '';
+        if ((<RatingSearch>query).min) {
+          rating += 'min-rating: ' + (<RatingSearch>query).min;
+        }
+        if ((<RatingSearch>query).max) {
+          rating += ' max-rating: ' + (<RatingSearch>query).max;
+        }
+        return rating.trim();
+      case SearchQueryTypes.resolution:
+        let res = '';
+        if ((<ResolutionSearch>query).min) {
+          res += 'min-resolution: ' + (<ResolutionSearch>query).min;
+        }
+        if ((<RatingSearch>query).max) {
+          res += ' max-resolution: ' + (<ResolutionSearch>query).max;
+        }
+        return res.trim();
+      case SearchQueryTypes.distance:
+        return (<DistanceSearch>query).distance + ' km from: ' + (<DistanceSearch>query).from.text;
+
+      case SearchQueryTypes.any_text:
+        return (<TextSearch>query).text;
+
+      case SearchQueryTypes.person:
+      case SearchQueryTypes.position:
+      case SearchQueryTypes.keyword:
+      case SearchQueryTypes.caption:
+      case SearchQueryTypes.file_name:
+      case SearchQueryTypes.directory:
+        if (!(<TextSearch>query).text) {
+          return '';
+        }
+        return SearchQueryTypes[query.type] + ':' + (<TextSearch>query).text;
+
+      default:
+        throw new Error('Unknown type: ' + query.type);
     }
   };
 }
diff --git a/src/frontend/app/ui/gallery/search/query-enrty/query-entry.search.gallery.component.html b/src/frontend/app/ui/gallery/search/query-enrty/query-entry.search.gallery.component.html
index e86db9cc..b04c690b 100644
--- a/src/frontend/app/ui/gallery/search/query-enrty/query-entry.search.gallery.component.html
+++ b/src/frontend/app/ui/gallery/search/query-enrty/query-entry.search.gallery.component.html
@@ -6,7 +6,7 @@
         name="listSearchType"
         class="form-control"
         [(ngModel)]="queryEntry.type"
-        (ngModelChange)="onChangeType($event)">
+        (ngModelChange)="onChangeType()">
         <option *ngFor="let opt of SearchQueryTypesEnum" [ngValue]="opt.key">{{opt.value}}
         </option>
       </select>
@@ -51,7 +51,7 @@
         name="searchType"
         class="form-control"
         [(ngModel)]="queryEntry.type"
-        (ngModelChange)="onChangeType(queryEntry)">
+        (ngModelChange)="onChangeType()">
         <option *ngFor="let opt of SearchQueryTypesEnum" [ngValue]="opt.key">{{opt.value}}
         </option>
       </select>
diff --git a/src/frontend/app/ui/gallery/search/query-enrty/query-entry.search.gallery.component.ts b/src/frontend/app/ui/gallery/search/query-enrty/query-entry.search.gallery.component.ts
index a3c004ab..21a4202d 100644
--- a/src/frontend/app/ui/gallery/search/query-enrty/query-entry.search.gallery.component.ts
+++ b/src/frontend/app/ui/gallery/search/query-enrty/query-entry.search.gallery.component.ts
@@ -97,7 +97,7 @@ export class GallerySearchQueryEntryComponent implements ControlValueAccessor, V
     this.AsListQuery.list.push(<TextSearch>{type: SearchQueryTypes.any_text, text: ''});
   }
 
-  onChangeType($event: any) {
+  onChangeType() {
     if (this.IsListQuery) {
       delete this.AsTextQuery.text;
       this.AsListQuery.list = this.AsListQuery.list || [
diff --git a/src/frontend/app/ui/gallery/search/search.gallery.component.ts b/src/frontend/app/ui/gallery/search/search.gallery.component.ts
index 76c56e44..4f0e7532 100644
--- a/src/frontend/app/ui/gallery/search/search.gallery.component.ts
+++ b/src/frontend/app/ui/gallery/search/search.gallery.component.ts
@@ -48,12 +48,11 @@ export class GallerySearchComponent implements OnDestroy {
     });
   }
 
-  public get rawSearchText() {
-    return JSON.stringify(this.searchQueryDTO);
+  public get rawSearchText(): string {
+    return SearchQueryDTO.stringify(this.searchQueryDTO);
   }
 
-  public set rawSearchText(val: any) {
-
+  public set rawSearchText(val: string) {
   }
 
   get HTMLSearchQuery() {