Add lake and river to the list of supported tags

[Dirk Hohndel: minor cleanups]

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>