toString fix for all entities