tagging re-work, fixes #7705, fixes #7703