Small upgrades to displaying mapInfoForm and fixes to mapHandler functions