Fix small issues with saving sort order