regex improvements, more work on the url detection