improving TimelineSubtreeQuery