Added query expansion.