Some bugfixing in folder view.