changes for clickable tags 6