bd: fix pushd/popd, swap default folder with old