Had to add fix again for search iterator as it somehow got lost?!