Query disambiguation can include identifying, a first set of word clusters in a first candidate answer generated in response to a first input query for a question-answering system. Each of the first set of word clusters can be classified according to a syntactic element of a first set of syntactic elements. Query disambiguation can include identifying, in the first input query, a second set of word clusters. Each of the second set of word clusters can be classified according to a syntactic element of a second set of syntactic elements. Query disambiguation can include determining that the first word cluster is classified according to a first syntactic element that is not present in the second set of syntactic elements and generating a second input query using the first input query and the first word cluster.