Extended query filtering pattern to support overrides