Improve display and add search by tag.