Added query expansion support