More SearchSpace improvements