Fixed the problems with the urgent update for the new JSON structures.