Lots of final fixes to Agric and water surveys