Search service and some fixes/updates for query builder