Make the folders always viewable
Improve folder view
Add first query