Modernising the water industry's use of rateable values to charge non-households