Metrics "Upcoming" Filter and Sort by feature

Being able to view the upcoming 7 days or 30days is an important feature. It's quite frustrating when the filter has "Last" but not a "Upcoming". The "Current" filter doesn’t help because the data ends the date at a certain point, not showing the future ones. Which can be confusing unless descirbed properly. Having the upcoming filter will make cleaning scheduling very much easier to understand and picture.

Plus, the data showing appears confusing due to improper sorting. So a sort by feature is needed. Screenshot attached as proof.