Make non-global search more efficient