diff --git a/pkg/persistence/postgres.go b/pkg/persistence/postgres.go
index 3665c25..0902be8 100644
--- a/pkg/persistence/postgres.go
+++ b/pkg/persistence/postgres.go
@@ -236,7 +236,7 @@ func (db *postgresDatabase) QueryTorrents(
 		{{ end }}
 			{{ if and .QueryExists .FirstPage }} WHERE {{ end }}
 		{{ if .QueryExists }} 
-			to_tsvector(replace(replace(name, '.', ' '), '-', ' ')) @@ websearch_to_tsquery('{{ .Query }}') 
+			to_tsvector(regexp_replace(name, '\W+', ' ', 'g')) @@ websearch_to_tsquery('{{ .Query }}') 
 		{{ end }}
 		ORDER BY {{.OrderOn}} {{AscOrDesc .Ascending}}
 		LIMIT {{.Limit}};