Added option to disable auto sort