fix for new cms json change
improve style