Make query executor always take KBPQuery as input.