JIRA OOIION-1326
update to selection procedure and activation for TOC 3rd level
Merge pull request #208 from birdage/selection_fix-r2

JIRA OOIION-1326