Fix my fix for MultiSelectorFilter to handle atomic and collection datasets again (TDS-503) after adding a unit test.