Fixed bug where sortChoice wasn't being applied onDestroy