Fixing Enqueue and wait for folder listing operations.