Refactored filtering

Made it a lot easier to add support for new keys to filter on for
headlines. Added filter by todos