I think this general comment but entryValues reduce readability. I would say it should be slightly different approach. For example
 for (Entry<Entity, String> entityStringEntry : entities.entrySet()) {
Entity es = entityStringEntry. getKey(); // here es not very clear name but could be improved later

Will it be possible to update like this?