diff --git a/src/app/ui/tags/tagspicker.ui.ts b/src/app/ui/tags/tagspicker.ui.ts
index 97c1cd0..c7bffc6 100644
--- a/src/app/ui/tags/tagspicker.ui.ts
+++ b/src/app/ui/tags/tagspicker.ui.ts
@@ -33,7 +33,13 @@ export class UiTagsPicker implements OnInit {
       .valueChanges
       .pipe(
         debounceTime(300),
-        switchMap(value => this.tagsService.search(value))
+        switchMap(value => {
+          if (value.startsWith('#')) {
+            value = value.replace('#', '');
+          }
+          value = value.split('#').join('-');
+          return this.tagsService.search(value);
+        })
       );
 
     this.tags = this.model || [];