Tagging popups + a few parser fixes: refs #5945 refs #5947, fixes #6123 fixes #5944