core-4428 fix folder selection