OPAL-2354: Deal with empty list of existing variables
Merge pull request #490 from emorency/OPAL-2354-add-to-view

OPAL-2354: Deal with empty list of existing variables