#97 Finished allowing sorting by common type, and switching between the two sorts mid survey.