added waterpoint retrieval and details