Fix unexpanded Scope Variables

Unexpanded variable sets inside Scope Variables were difficult to see