Your fix sounds sensible and it no longer showing on maps. It is an interesting conundrum (generally) for long distant cyclists and walkers who take filtration devices who need to search for taps and drinking_water and your other link is probably more key than this one that any water (correctly filtrated) is better than none.  If you look at the Munda Biddi 1000km, the main source of water is untreated tanks and you would want to keep the drinking water on these.