Refactor partial render tags