** fixed unarchive, so that it will be called when entity.archived =
false