Fix JSON form submission
simplify