restructed selective_search