[UPDATE] separated url check