Fix to sort issue of lunch moving