URL handling fixed