changed multiple search term string to underscore seperated
Better handling of search queries
Merge remote-tracking branch 'origin/feature/backend' into develop
Merge branch 'feature/frontend' into develop