Tweaks with object_tag to get ride of <em>None</em> problem.