Reworked Filtered Collection implementation to use Filter instances

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>