My tank was filling on city water as well. Wasn't sure if it was the Anderson valve or the water pump. I keep a water pump as a spare and swapped it out. That stopped the fresh water tank from filling. I ordered a new "head" for the water pump that contains the check valve, replaced it on the old pump, and now use it as my spare.