Adjust Timeseries query to take a context parameter that causes it to skip empty buckets