Update FilterBuilder interface

Make the FilterBuilder interface consistent with the QueryBuilder
interface.