Hi there, @darren.james7518… if I understand your post correctly, you should be able to scrap the custom state, leave the repeating group’s data source as you are showing it, and add two conditionals to the repeating group that look like this…
In the screenshot, I am showing the constraints on the search for expired events. I’m sure it goes without saying that the constraints on the search for active events are the same with the less than operator flipped to greater than.
Hope this helps.
Best…
Mike