Refactoring & bugfix

Fixed: Foldern with comma in name not opening.