QueryExpansion and TopKQueryExpansion changes