More correctness in the automatic json / form handling