changes for clickable tags 5