Clean up: let filter builders handle their own value / active status themselves
Clean up: let builders inherit from a base class, move them in a separate directory