Better handling of indexed-field filtering