Filters work separately

...but there are issues when you try to have both done, in specific
orders. Going to fix master, and then probably change this branch to be
two spinners