Quick Search cleanup