Urgent: Resolves Global Search not working in some cases