added more fields to the advanced water context calculator