Fixed saving sort state