fix more issues with proper reinit of query / context state from server ...

...to client