Gilbert is moving ahead on two fronts to address months of resident complaints about unusually high water bills.