Added more tag display code (not deployed yet)