Fixed batch control company_id regex also