v2.8.5 MapHelper fixes

- Fixed MapHelper