Make url validation more restrictive and add uri validation for more relax rule