Updating mapping to check distinct terms where available to improve accuracy