Fixed crash if no servers match
Merge branch 'gms-query' into mckay