adding in time based queries