Issue: Spotlight js fixes