Fix for global search