SCHEMA-145. Improves consistency of filter contexts.

Signed-off-by: Aaron Kimball <aaron@wibidata.com>