ECMS-4195 fix problem with cached selected nodes mentioned in ECMS-4593