Make checkbox order match report order