Water dump revamped

I feel that this building is not greatly integrated.

It's not useful to fill up a big reservoir (too much water to transfer and with 1 job / dump it will take too much jobs).
There is no point to transfer water to a little reservoir to pump it again for drinkable water.

Yet you could use it to fill up some small reservoir for watering the ground, but what's the point when instead you have some canals to do that ?
And if a big reservoir is too far to do that, it will still take time and workers/haulers for all the pumping, transferring and dumping.

Taking water from a pump to transfer it into a tank with a bucket is logical and feels natural.
Taking water from a tank to transfer it into a reservoir WITH A LITTLE BUCKET seems pretty silly.

And finally it allows for the "1 tile watering" exploit.