refactoring response tags for dataservice