A server accesses an initial query associated with a classification, the classification corresponding to a likely intent of the initial query. The server obtains a set of queries, wherein each query in the set of queries is identified as having resulted in one or more users selecting a resource that was selected by one or more users in response to submitting the initial query. The server then determines a metric for one or more queries in the set of queries, wherein the metric for each of the one or more queries in the set of queries is based on a similarity between the respective query and the initial query. Next, the server selects a subset of queries from the set of queries based on the metric for each selected query satisfying a threshold and associates the selected subset of queries with the classification of the initial query.