Fix tag extraction.