better handling of URLs