Hopefully fixed toggle conflict for subj/qtrs

It was causing an issue if you filtered out subjects and then used the
quarter toggle. This needs some testing since I'm not 100% sure though