Fix issue where server2 was always picked if no matches started