Moved sorter to changeset store so it works properly