Add icons and filter by topic in the saved queries