Better handling of 'created expired' entities, during 'restore'