Fix client side sort filter and improve a status value