Update Jsonary and fix forms