Fixed export - user_id field issue