Fixed sorting error where selecting new sort criteria and selecting cancel still changed sorting criteria in SCVA
merged