rename TIP_WITH_SEARCH to TIP; old version to TIP_SINGLE_NODE