relecture core/lib/search : done