changes for clickable tags 3