fix form data and service