fix multi-database installs, while hopefully keeping performance improvement