CHANGE: Changes in generator.yml (Filter) Improvements