merge in entities changes, pretty_name display