Updated the tag rules to not be as annoying in the output.