url check improved
Merge branch 'bug/fix-url-check' into develop