Data pulling bug fixes concerning data order