Issue #916

This PR fixes the original usability bug (#916) as well as some subsequent bugs. All revolved around what happens when the filter is cleared or when the different operations are selected.