added condition against folder_listing