Correctly remember MAP access selection.