Revising TimelineSubtreeQuery

performance improvements + some additional features suggested by Javier