add missing where clause to water simplification
remove reference to non-existing column