Feature/67306010 streamline urls