Add "Unit" in Analysis data during json AR read.
Small setupdata-loader bug fixes