Rebuilt global searching