`?` fix and folder listing