(*) Improvements to FilterBuilder so the conditions logic is not implemented in the models