Avoid call_user_func_array in query method

I think that we need a final word from @aembler and/or @KorvinSzanto ...