Search subject filters

The first 2 commits are in another pull request #141.  So just look at the 3rd commit...

This is a temporary solution for subject filters not working when there are more than one subject.  It's not obvious to me how to change the SQL to get the search to work.  So I'm removing the subject filters if the search results are already filtered by a subject.