Multi layout folder select fixes