VariableResolver amendments for NotesIn9 demo