Fix spotlight
Use new class called SpotLightEntry