Make 'a folder with a document' keyword more robust.