Improve filters management
Speed things up
Return a list instead of an iterator