I am preparing a new database that will widely increase the filterable options (and no doubt complicate the code incredibly but that is the price we pay!).
In any case, with the new database I should be able to implement the two features requested here.
It will take a while to bring this up since I will be out of the country next week most likely. So maybe something we see the following week... unless it comes together really quickly