better handling of search for basins