Rework GlobalSearch