MapStoreWrapper minor improvements (issue #1057)

issue #1057