update stage 1 group query please test in threaded apps