Fix form messages include for locations