search changes require oc 8

@MorrisJobke @PVince81 @georgehrke @raghunayyar