I know, this should be splitted into more than one commit. Shame on me.
This should make things cleaner and easier to add filters in the future"