Made search more reliable