PHOENIX-901 Ensure ConnectionQueryServices only initialized once (JamesTaylor)