Filter shortcuts and design improvements

The commit messages are quite explanatory.