Refactor to remove builders.
Fixing SQLFilter