diff --git a/ippisite/ippidb/templates/compound_card.html b/ippisite/ippidb/templates/compound_card.html
index f2a4df839b27259cc946973af498132d604f4556..9b1c5e0f063e357ddd5748eecc722b7c65f41a99 100644
--- a/ippisite/ippidb/templates/compound_card.html
+++ b/ippisite/ippidb/templates/compound_card.html
@@ -561,17 +561,31 @@
 
   {
 "url": "{{ request.build_absolute_uri }}",
+{% if compound.inchi %}
 "inChI": "{{ compound.inchi }}",
+{% endif %}
+{% if compound.iupac_name %}
 "name": "{{ compound.iupac_name }}",
+{% endif %}
+{% if compound.iupac_name %}
 "iupacName": "{{ compound.iupac_name }}",
+{% endif %}
+{% if compound.molecular_weight %}
 "molecularWeight": {{ compound.molecular_weight }},
+{% endif %}
 "identifier": "{{ compound.id }}",
-"inChIKey": "{{ compound.inchi }}",
+{% if compound.inchikey %}
+"inChIKey": "{{ compound.inchikey }}",
+{% endif %}
 "@type": "MolecularEntity",
-"image": "https://www.ebi.ac.uk/chembl/api/data/image/CHEMBL3623057.svg",
+{% if compound.chembl_id %}
+"image": "https://www.ebi.ac.uk/chembl/api/data/image/{{chembl_id}}.svg",
+{% endif %}
+{% if compound.canonical_smile %}
 "smiles": [
-  "{{ compound.canonical_smile }}"
+  "{{ compound.canonical_smile|escapejs }}"
 ],
+{% endif %}
 {% if compound.sameas_urls %}
 "sameAs": {{ compound.sameas_urls|safe }},
 {% endif %}