minor changes toward inner-search during expansion
minor changes toward inner-search