Fix datatable and ongoing work on plus values