Most of the filtering voodoo moved to query, added sieve field support.