Minor tag tweaks, add comparator and change to string to just give name