Fix optimistic searching