Added some punctuation to watch for and made the tags case insensitive.