improve queryUser