fixed URL handling