Improve url regex