#932 Implemented smart tags for content option