More defensive code to prevent looping
3.3, redesign Review sorting