Fixed issues with JSON data and no-touch