Need to always pass query_context to satisfy protostellar

[mikereiche]

Need to always pass query_context to satisfy protostellar

[programmatix]

Small note that this is really needed for the other platform that shall not be named :) (Though it is required for Protostellar too, yes)

[mikereiche]

#1620 is related/duplicate