Migrated filter functionality completely to FIlteringList.  Updated tests.