Bug fix: Error stack trace
Reformat query
Secure folders