Try cleaning up some tags code

Not quite sure if this works or not. Going to need extreme amounts of testing