better namespacing of current cloud selection