Revert "Remove tags - possible display fix"

This reverts commit 04cbe77d5b419cfc7d9e4c485313746a9f28bba7.