better support for disambiguated data