Refactor complex query
Fix autoload of query_objects dir
Change bg color of collapse body to white
Merge branch 'develop'