Need Help with Vanilla Water Bottle

Setting up a sink block that slowly produces water, and have it set up so that you can fill buckets from it if it contains enough water.

When I do a similar thing with the empty bottle, the "water bottle/any_potion" item causes the player to receive the uncraftable potion.

Mine crafts internal ID for the water bottle is, minecraft:potion{Potion:water}

Anyone know how to format the internal ID to work as a tag, or of any way to use the internal ID's to give the player a water bottle?