Scaling out Search—adding a query component