Handle tags and line numbers in tokenizer
Use string for tag name and remove line from %Tag