CRM-14490 - Fix batch entry table