Improved url -> link regexp