Add a checkbox to keep filters; fixes #22
Cleanup, simplification, display