Limit Landmarks on Map Screen

I have a lot of Landmarks.. I put them in different folders to sort them, but when I click the Landmarks dropdown in the Map window, I get a list of all the landmarks.

1. I'd like to be able to either see just landmarks from a specific folder, or have the option to select which folders are included..

2. A button on the map screen to center the map on your landmark. Maybe preference to have this be automatic or not.. This would help someone cycle through their landmarks to see if areas they frequent have folks around or not.

Thanks!