Remove ORDER from BQ query and sort in package
Deal with empty datastore entities