Keep URL whole. Fixes #590