Fixes #6298 adds a few conditionals to the child tag clause that prevents tags from being added
Fixes $6298 pt 2 where the done button pops up willy nilly if the content requires it