Now supporting folder with whitespaces inside id. Close #2