fix form data serialization & query