Fix addressing of form data