Improve URL regex