Fixed parsing JSON from UI