Handle re-show, Log cleanup

re-shows handled at tag level instead of container level in case of
nesting.