Tagset Fix with new codebase for merge compatibility

This is the updated tag set fix, should be compatible with most recent code base for easy merging