- Changed retrieval of subfolder by folderid