Add query files needed by the water module.
Fix bugs found when testing gcam-query function against stock queries.