Improving datastream indexing

Fixes https://www.pivotaltracker.com/story/show/81198770