Yes, I think your proposal makes sense. I would prefer that approach rather than what I've detailed above with retrieving everything within a potential 2-year timeframe to fit purposes that the user most likely did not query in the first place for.