1802 | Subhas | Fix check_box and order