improved form builder to accomodate maps