Increased number of tags generated to eight