minor fixes

* loading default config
* join criteria simplified