Improve display for entities tool to show whether or not an entity will be deleted, but also show its name