Iteration on search fixes