Fixing ContentAssistant and variable picker issues