Sorry it took me 4 months but it's done now. I wanted to add simply just [[water]] too but I hit the max of 10 options.

I'd like to suggest adding pond, river, and hot_spring to the options, as these seem to come up fairly often.