The use of folder and subfolders in the Waypoints section.

It would be nice to have folders and sub-folders to be able to classify the waypoints (the way firefox does for it's bookmarks). If I am in New York, I wouldn't want to see Boston's Waypoints. If I am looking at a Map of Canada, I would want to see the waypoints that mark the cities and towns and not those that mark the streets, landmarks and parks of the cities.