Profile Mapping : userContext not set properly AND map mutliple contacts is missing a Done button

Two issues w/ map pages when accessed from Profiles:

1. The page that is loaded for mapping all search result contacts -> "map these contacts" (/civicrm/profile?_qf_Search_display=true&map=1) needs to have a Done button which explicitly goes back to search results page (as we have on the single contact map from profile page - e.g on http://.../civicrm/profile/map?reset=1&cid=108&gid=1). Currently there is no way to navigate from this page.

2. I don't think we're setting the correct userContext on the single record map page - so the Done button returns "randomly" to pages other then the profile search results - depending on where else you've navigated to (it goes to http://..../civicrm/profile which might bring up the "map all contacts" page instead of search results - or other profile methods depending on where else you've been).