Change spotlight header CC-434
Some Spotlight cleaning up