Minor tweak to avoid NONE and [] in the HOT template output