Updated $skip management in the DataService