Add grouping to search, and a nice book icon.