Full working modeler with filters definition #3
Merge origin/master