Search space upgrades