URLs with querystrings were not saved correctly
Merge branch 'parse_url_bugfix'