fixed private govt logic
renamed admin classes
using query instead of id for management and water source query