Fix time window rendering and add default values for timeWindow and aggregate