Standardized water sources in Israel

Israeli topographic maps prominently feature water sources.
We should discuss how to tag the following entities, which are currently inconsistently tagged:
בור מים
ברכת השקייה
גב

IMO

man_made=cistern for בור מים

What about גב?

natural=waterhole