change entity to water user group, closes #127