Added code to make folder selection explicit

Reversion to mbm capabilites.