Some final touches to url parser