added partials, additional validation for url