Issue: spotlight with video fix