Fix Boolean Null handling. Fix String with HTML