1. A method comprising: receiving a query in a computer system, the computer system comprising one or more computers, the query including an entity; generating in the computer system a group of candidate aspects for the entity; modifying in the computer system the group of candidate aspects to generate a group of modified candidate aspects comprising combining similar candidate aspects and grouping candidate aspects using one or more aspect classes each associated with one or more candidate aspects; ranking in the computer system one or more modified candidate aspects in the group of modified candidate aspects based on a diversity score and a popularity score; associating in the computer system one or more highest ranked modified candidate aspects with the entity; receiving in the computer system one or more sets of search results; and providing a presentation of the search results in response to the query, the presentation presenting the search results organized according to the aspects associated with the entity.