Global Search rework