Better newVersion dataStore method

Now using two queries but both with indexes. Should be faster.