Export lib: put storage/format labels back

This looks better to me. If this turns out to be ineffective, this can always be reverted.