Fix remaining problems introduced by jsonlite fustercluck in the data preparation stage, plots not entirely fixed yet