SearchBuilder Changes