Tags processing improved