add processing of serverChoice, ignore "" if found in query.