Change search builder to static