Fixed all issues with filters and datatables