add disambiguations in server context