id	summary	reporter	owner	description	type	status	priority	milestone	component	version	resolution	keywords	cc
10314	natural=water	przemas75	team	"There are only these
water=lake
water=pond
water=reservoir
water=lagoon

extensions for natural=water, it was approved and is in use other values:
[http://taginfo.openstreetmap.org/keys/water#values water]=oxbow,cover,canal  etc

http://wiki.openstreetmap.org/wiki/Key:water
http://wiki.openstreetmap.org/wiki/Proposed_features/Water_details

Kindly add some more to the preset.
"	enhancement	closed	normal	14.08	Internal preset		fixed	natural water