Fix bug with url resource
Merge branch 'resource_fix_bugs'