Improved url regex