Merge branch 'fix/prefer-url-over-search' into 'develop'