Nested queries: cleanup + some config files