Small refinements to search space