Filtering removes selection

Closes #751