How Do I Hide Past Events in Category Layout?

Hello!
How do I hide past events from being listed in the category layout (column, default, timeline, and table)? I did set Yes to Hide Past Event configuration but it is still listing past events.

 

In the frontend:

 

In the menu item for the category layout timeline, under options tab I set it to:

 

Upcoming means future or current events/dates, right? If I change the option to Past Events, it does remove the upcoming events so that filter works except that Upcoming Events meant something. Although the events listed as recurring and has upcoming dates, it should list the next available date from today, right?

Tuan, I traced the query for Category model and it it does apply hiding past events but it only pull the parent data (tbl.parent_id = 0 in the query). Seems like confusing for end users, don't you think? The event date displayed in the lists is when the recurring event started (the parent event item), in my opinion, it should display the next available children of an event >= the current date.

Thanks,
Jackson