toast fix and List sort