This was breaking for cases where values contained characters used for
markup such as <> or & and also for the special case of None which is
used to render disabled items.