[21.19] Issue with limited amount of saved locations in the list

Hello! 

I've got a new Forerunner 965 and transferred my saved locations from old watch (~80 waypoints). Suddenly I found out that the list of Saved locations via "Navigation -> Saved locations" counts only 50 waypoints ordered by the distance from you. So, in this list I can't see ~30 waypoints, but using map they are on the place. 

Could it be fixed with another firmware update, please? 
I use the navigation to my saved locations quite often and it's not a rare situation when I want to navigate to one of my far waypoint which is not included in first 50 waypoints from the list 

Thank you!