Fix Issue #107 Command Spotlight Enhancement