Improve selection of timeseries a bit