Improved commands do_cd_folder and do_cd_bookmark