Fixed search builder issue