Refine Timeframe filter a bit