Added time windows for queries