better support for strange urls