Refactor Spotlight to avoid BuildDisplay.