[BUGFIX] Ensure proper form field names for attachment fields