Water Bottle Missing NBT Tag

When selecting a water bottle from the creative inventory, it has the new NBT tag of {Potion:"minecraft:water"}. However, filling an empty bottle from a water source results in a water bottle item without the tag. This is also reflected in the tooltip.

As a result, testing for a player who has just filled a water bottle, when testing for the "minecraft:water" potion NBT tag, does not function properly.