#4 minor refactoring
#4 do not pause when filtering: seems to work better