Datatable bugs fixed