Improve tag code more