minor changes in filter/disambiguate syntax
initial generator support for filters