Fixed issues in json