Corrected problems with tags generation