Tagging feature flag tweaks

Although in theory people should not have any tags if the feature is
disabled, it feels cleaner to explicitly disable the display code using
the feature flag as well.