More moves data sorting fixes