Fix query invoker - support result listing