Fix Srv_query (XP3)