changes for clickable tags 2