diff --git a/src/database/DatabaseUpdater.cpp b/src/database/DatabaseUpdater.cpp
index 7a1fa6b7..0ba96f85 100644
--- a/src/database/DatabaseUpdater.cpp
+++ b/src/database/DatabaseUpdater.cpp
@@ -124,7 +124,7 @@ Updater& Updater::instance(void)
 }
 
 Updater::Updater()
- : _running(false),
+ : _running(true),
 _scheduleTimer(_ioService)
 {
 	_ioService.setThreadCount(1);
diff --git a/src/database/cluster/DatabaseHighLevelCluster.cpp b/src/database/cluster/DatabaseHighLevelCluster.cpp
index c517da3d..81ce53f9 100644
--- a/src/database/cluster/DatabaseHighLevelCluster.cpp
+++ b/src/database/cluster/DatabaseHighLevelCluster.cpp
@@ -17,12 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "DatabaseHighLevelCluster.hpp"
-
-#include "config/Config.hpp"
 #include "logger/Logger.hpp"
+
+#include "database/Setting.hpp"
 #include "feature/FeatureStore.hpp"
 
+#include "DatabaseHighLevelCluster.hpp"
+
 namespace Database {
 
 static Cluster::pointer getCluster(std::string type, std::string value)
@@ -166,8 +167,7 @@ static std::list<std::string> getClustersFromFeature(Feature::Type& feature)
 void
 HighLevelCluster::processDatabaseUpdate(Updater::Stats stats)
 {
-	bool createTags = Config::instance().getBool("tag-highlevel-acousticbrainz", false);
-
+	bool createTags = Setting::getBool(UpdaterDboSession(), "tags_highlevel_acousticbrainz", false);
 
 	LMS_LOG(DBUPDATER, INFO) << "Creating high level based clusters...";
 
@@ -179,8 +179,6 @@ HighLevelCluster::processDatabaseUpdate(Updater::Stats stats)
 		if (UpdaterQuitRequested())
 			return;
 
-		LMS_LOG(DBUPDATER, DEBUG) << "Processing track " << trackId;
-
 		// Get current cluster names
 		std::list<std::string> newClusterNames;
 		if (createTags)