Add more functionality to handle and display tags