QXlib integration
Make folder integration more robust