Fix OverviewMap control, integration-test pass