Fix - checking for matching tag type before adding