Url regexp improved