Prevent some URL bugs
Merge branch 'feature/searchbugs' into develop
Prevent invalid URLs to be fetched
Merge branch 'feature/searchbugs' into develop