*8235* Search cleanup