Add category, class, echelon to payslip report - requires rename of 'class' field