Bugfix filtering
Merge branch 'terminalChanges'