Correct URL creation for search result.
Merge branch 'Hotfix' into develop