Fixed BD-11: Spider: multi-level aggregate query with filtering causes NPE