Map Form now properly updates