#49 Convert TEITags extension to work with MW 1.20.2

Additional refactoring