parse tag improvement