Fixed tags generation.