Add query expansion