fixed support of tags