URL handling bugfix