Fix map controls and resolve Analyses Message issue

Fix map controls and resolve Analyses Message issue #2026