Better handling of entity/profile csv upload