Move time window to the right of aggregate option