Changed from max search depth to detect already searched parent containers.