More fixes

water_functional from using borehole specific question to a more generic question.
adding date_of_survey to water points.