Changed json format to allow for html as well