Fix for move to folder

Close #765.
add *them* back later (plural)