improve extract tags