C3 mahmoud hashish #90 fix archive unarchive

@marwa-mehanna @Dayna161193 @omar-kassem please review this branch to be merged to master