convert entity ids to use agency + entity