Query API updates to fix var args issues realized.