Fix for remote queries targeting specifc servers.
Fix for remote queries targeting specifc servers.

eclub-sense/zetta2.0-runtime,kyork-cl/zetta,zettajs/zetta,eclub-sense/zetta,DhruvKumar/zetta,eclub-sense/zetta2.0-runtime,eclub-sense/zetta,DhruvKumar/zetta,kyork-cl/zetta,zettajs/zetta