Update form to add map/report attachment

Add custom fields in a smarter way.