Improve URL validator