Handle URLs correctly