diff --git a/servers/slapd/overlays/auditlog.c b/servers/slapd/overlays/auditlog.c
index c85a237909..6f5789a001 100644
--- a/servers/slapd/overlays/auditlog.c
+++ b/servers/slapd/overlays/auditlog.c
@@ -219,6 +219,7 @@ int auditlog_initialize() {
 	int rc;
 
 	auditlog.on_bi.bi_type = "auditlog";
+	auditlog.on_bi.bi_flags = SLAPO_BFLAG_SINGLE;
 	auditlog.on_bi.bi_db_init = auditlog_db_init;
 	auditlog.on_bi.bi_db_destroy = auditlog_db_destroy;
 	auditlog.on_response = auditlog_response;
diff --git a/servers/slapd/overlays/autoca.c b/servers/slapd/overlays/autoca.c
index dbaa4e0676..ec241fa9fd 100644
--- a/servers/slapd/overlays/autoca.c
+++ b/servers/slapd/overlays/autoca.c
@@ -1088,6 +1088,7 @@ int autoca_initialize() {
 	int i, code;
 
 	autoca.on_bi.bi_type = "autoca";
+	autoca.on_bi.bi_flags = SLAPO_BFLAG_SINGLE;
 	autoca.on_bi.bi_db_init = autoca_db_init;
 	autoca.on_bi.bi_db_destroy = autoca_db_destroy;
 	autoca.on_bi.bi_db_open = autoca_db_open;
diff --git a/servers/slapd/overlays/collect.c b/servers/slapd/overlays/collect.c
index 61883fd757..2884e48e64 100644
--- a/servers/slapd/overlays/collect.c
+++ b/servers/slapd/overlays/collect.c
@@ -419,6 +419,7 @@ int collect_initialize() {
 	int code;
 
 	collect.on_bi.bi_type = "collect";
+	collect.on_bi.bi_flags = SLAPO_BFLAG_SINGLE;
 	collect.on_bi.bi_db_destroy = collect_destroy;
 	collect.on_bi.bi_op_modify = collect_modify;
 	collect.on_response = collect_response;
diff --git a/servers/slapd/overlays/constraint.c b/servers/slapd/overlays/constraint.c
index 100fc75e36..c81d327793 100644
--- a/servers/slapd/overlays/constraint.c
+++ b/servers/slapd/overlays/constraint.c
@@ -1207,6 +1207,7 @@ constraint_initialize( void ) {
 	int rc;
 
 	constraint_ovl.on_bi.bi_type = "constraint";
+	constraint_ovl.on_bi.bi_flags = SLAPO_BFLAG_SINGLE;
 	constraint_ovl.on_bi.bi_db_destroy = constraint_destroy;
 	constraint_ovl.on_bi.bi_op_add = constraint_add;
 	constraint_ovl.on_bi.bi_op_modify = constraint_update;
diff --git a/servers/slapd/overlays/dds.c b/servers/slapd/overlays/dds.c
index a64e7b6a8e..e33e3a8b0b 100644
--- a/servers/slapd/overlays/dds.c
+++ b/servers/slapd/overlays/dds.c
@@ -1992,6 +1992,7 @@ dds_initialize()
 
 	dds.on_bi.bi_type = "dds";
 
+	dds.on_bi.bi_flags = SLAPO_BFLAG_SINGLE;
 	dds.on_bi.bi_db_init = dds_db_init;
 	dds.on_bi.bi_db_open = dds_db_open;
 	dds.on_bi.bi_db_close = dds_db_close;
diff --git a/servers/slapd/overlays/deref.c b/servers/slapd/overlays/deref.c
index b3c7f60d2d..546e651f53 100644
--- a/servers/slapd/overlays/deref.c
+++ b/servers/slapd/overlays/deref.c
@@ -564,6 +564,7 @@ int
 deref_initialize(void)
 {
 	deref.on_bi.bi_type = "deref";
+	deref.on_bi.bi_flags = SLAPO_BFLAG_SINGLE;
 	deref.on_bi.bi_db_init = deref_db_init;
 	deref.on_bi.bi_db_open = deref_db_open;
 #ifdef SLAP_CONFIG_DELETE
diff --git a/servers/slapd/overlays/dyngroup.c b/servers/slapd/overlays/dyngroup.c
index 615caf0f4e..117dddf78c 100644
--- a/servers/slapd/overlays/dyngroup.c
+++ b/servers/slapd/overlays/dyngroup.c
@@ -208,6 +208,7 @@ int dyngroup_initialize() {
 	int code;
 
 	dyngroup.on_bi.bi_type = "dyngroup";
+	dyngroup.on_bi.bi_flags = SLAPO_BFLAG_SINGLE;
 	dyngroup.on_bi.bi_db_destroy = dyngroup_destroy;
 	dyngroup.on_response = dyngroup_response;
 
diff --git a/servers/slapd/overlays/dynlist.c b/servers/slapd/overlays/dynlist.c
index 7fd113a289..5ed4097868 100644
--- a/servers/slapd/overlays/dynlist.c
+++ b/servers/slapd/overlays/dynlist.c
@@ -2657,6 +2657,7 @@ dynlist_initialize(void)
 	dynlist.on_bi.bi_obsolete_names = obsolete_names;
 #endif
 
+	dynlist.on_bi.bi_flags = SLAPO_BFLAG_SINGLE;
 	dynlist.on_bi.bi_db_init = dynlist_db_init;
 	dynlist.on_bi.bi_db_config = config_generic_wrapper;
 	dynlist.on_bi.bi_db_open = dynlist_db_open;
diff --git a/servers/slapd/overlays/seqmod.c b/servers/slapd/overlays/seqmod.c
index d94ca54c68..13720e7539 100644
--- a/servers/slapd/overlays/seqmod.c
+++ b/servers/slapd/overlays/seqmod.c
@@ -185,6 +185,7 @@ int
 seqmod_initialize()
 {
 	seqmod.on_bi.bi_type = "seqmod";
+	seqmod.on_bi.bi_flags = SLAPO_BFLAG_SINGLE;
 	seqmod.on_bi.bi_db_open = seqmod_db_open;
 	seqmod.on_bi.bi_db_close = seqmod_db_close;
 
diff --git a/servers/slapd/overlays/sssvlv.c b/servers/slapd/overlays/sssvlv.c
index 33c3599660..f25049d61b 100644
--- a/servers/slapd/overlays/sssvlv.c
+++ b/servers/slapd/overlays/sssvlv.c
@@ -1406,6 +1406,7 @@ int sssvlv_initialize()
 	int rc;
 
 	sssvlv.on_bi.bi_type				= "sssvlv";
+	sssvlv.on_bi.bi_flags				= SLAPO_BFLAG_SINGLE;
 	sssvlv.on_bi.bi_db_init				= sssvlv_db_init;
 	sssvlv.on_bi.bi_db_destroy			= sssvlv_db_destroy;
 	sssvlv.on_bi.bi_db_open				= sssvlv_db_open;
diff --git a/servers/slapd/overlays/unique.c b/servers/slapd/overlays/unique.c
index 17344e1cd4..76c05d76be 100644
--- a/servers/slapd/overlays/unique.c
+++ b/servers/slapd/overlays/unique.c
@@ -1514,6 +1514,7 @@ unique_initialize()
 	memset (&unique, 0, sizeof(unique));
 
 	unique.on_bi.bi_type = "unique";
+	unique.on_bi.bi_flags = SLAPO_BFLAG_SINGLE;
 	unique.on_bi.bi_db_init = unique_db_init;
 	unique.on_bi.bi_db_destroy = unique_db_destroy;
 	unique.on_bi.bi_op_add = unique_add;
diff --git a/servers/slapd/overlays/valsort.c b/servers/slapd/overlays/valsort.c
index dfd4761d96..38190ae902 100644
--- a/servers/slapd/overlays/valsort.c
+++ b/servers/slapd/overlays/valsort.c
@@ -545,6 +545,7 @@ int valsort_initialize( void )
 	int rc;
 
 	valsort.on_bi.bi_type = "valsort";
+	valsort.on_bi.bi_flags = SLAPO_BFLAG_SINGLE;
 	valsort.on_bi.bi_db_destroy = valsort_destroy;
 	valsort.on_bi.bi_db_open = valsort_db_open;