Handle storing of null values better
Rework how scenes render content so it will not get stored