Tag Display Upgrade

Fixed tag display to correspond to proper location and comment
availability.