Issue: spotlight fix