fix(eventstore): sub queries (#1805)

* sub queries

* fix: tests

* add builder to tests

* new search query

* rename searchquerybuilder to builder

* remove comment from code

* test with multiple queries

* add filters test

* fix(contibute): listing

* add validate module

* fix: search queries

* remove unused event type in query

* ignore query if error in marshal

* go mod tidy

* update privacy policy query

* update queries

Co-authored-by: Livio Amstutz <livio.a@gmail.com>

internal/command/existing_label_policies_model.go

@@ -42,13 +42,14 @@ func (rm *ExistingLabelPoliciesReadModel) Reduce() error {
 }
 
 func (rm *ExistingLabelPoliciesReadModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(
-		eventstore.ColumnsEvent,
-		iam.AggregateType,
-		org.AggregateType).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
+		AddQuery().
+		AggregateTypes(iam.AggregateType).
+		EventTypes(iam.LabelPolicyAddedEventType).
+		Or().
+		AggregateTypes(org.AggregateType).
 		EventTypes(
-			iam.LabelPolicyAddedEventType,
 			org.LabelPolicyAddedEventType,
-			org.LabelPolicyRemovedEventType,
-		)
+			org.LabelPolicyRemovedEventType).
+		Builder()
 }

internal/command/iam_custom_login_text_model.go

@@ -40,10 +40,13 @@ func (wm *IAMCustomLoginTextReadModel) Reduce() error {
 }
 
 func (wm *IAMCustomLoginTextReadModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, iam.AggregateType).
-		AggregateIDs(wm.CustomLoginTextReadModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateIDs(wm.CustomLoginTextReadModel.AggregateID).
+		AggregateTypes(iam.AggregateType).
 		EventTypes(
 			iam.CustomTextSetEventType,
-			iam.CustomTextRemovedEventType)
+			iam.CustomTextRemovedEventType).
+		Builder()
 }

internal/command/iam_custom_message_text_model.go

@@ -39,9 +39,11 @@ func (wm *IAMCustomMessageTextReadModel) Reduce() error {
 }
 
 func (wm *IAMCustomMessageTextReadModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, iam.AggregateType).
-		AggregateIDs(wm.CustomMessageTextReadModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
-		EventTypes(
-			iam.CustomTextSetEventType)
+		AddQuery().
+		AggregateTypes(iam.AggregateType).
+		AggregateIDs(wm.CustomMessageTextReadModel.AggregateID).
+		EventTypes(iam.CustomTextSetEventType).
+		Builder()
 }

internal/command/iam_custom_text_model.go

@@ -39,9 +39,12 @@ func (wm *IAMCustomTextWriteModel) Reduce() error {
 }
 
 func (wm *IAMCustomTextWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, iam.AggregateType).
-		AggregateIDs(wm.CustomTextWriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateIDs(wm.CustomTextWriteModel.AggregateID).
+		AggregateTypes(iam.AggregateType).
 		EventTypes(
-			iam.CustomTextSetEventType)
+			iam.CustomTextSetEventType).
+		Builder()
 }

internal/command/iam_features_model.go

@@ -43,10 +43,12 @@ func (wm *IAMFeaturesWriteModel) Reduce() error {
 }
 
 func (wm *IAMFeaturesWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, iam.AggregateType).
-		AggregateIDs(wm.FeaturesWriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
-		EventTypes(iam.FeaturesSetEventType)
+		AddQuery().
+		EventTypes(iam.FeaturesSetEventType).
+		AggregateTypes(iam.AggregateType).
+		Builder()
 }
 
 func (wm *IAMFeaturesWriteModel) NewSetEvent(

internal/command/iam_idp_config_model.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+
 	"github.com/caos/zitadel/internal/eventstore"
 
 	"github.com/caos/zitadel/internal/domain"
@@ -26,9 +27,11 @@ func NewIAMIDPConfigWriteModel(configID string) *IAMIDPConfigWriteModel {
 }
 
 func (wm *IAMIDPConfigWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, iam.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(iam.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(
 			iam.IDPConfigAddedEventType,
 			iam.IDPConfigChangedEventType,
@@ -36,8 +39,8 @@ func (wm *IAMIDPConfigWriteModel) Query() *eventstore.SearchQueryBuilder {
 			iam.IDPConfigReactivatedEventType,
 			iam.IDPConfigRemovedEventType,
 			iam.IDPOIDCConfigAddedEventType,
-			iam.IDPOIDCConfigChangedEventType,
-		)
+			iam.IDPOIDCConfigChangedEventType).
+		Builder()
 }
 
 func (wm *IAMIDPConfigWriteModel) AppendEvents(events ...eventstore.EventReader) {

internal/command/iam_idp_oidc_config_model.go

@@ -2,9 +2,10 @@ package command
 
 import (
 	"context"
-	"github.com/caos/zitadel/internal/eventstore"
 	"reflect"
 
+	"github.com/caos/zitadel/internal/eventstore"
+
 	"github.com/caos/zitadel/internal/crypto"
 	"github.com/caos/zitadel/internal/domain"
 	"github.com/caos/zitadel/internal/repository/iam"
@@ -69,15 +70,18 @@ func (wm *IAMIDPOIDCConfigWriteModel) Reduce() error {
 }
 
 func (wm *IAMIDPOIDCConfigWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, iam.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(iam.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(
 			iam.IDPOIDCConfigAddedEventType,
 			iam.IDPOIDCConfigChangedEventType,
 			iam.IDPConfigReactivatedEventType,
 			iam.IDPConfigDeactivatedEventType,
-			iam.IDPConfigRemovedEventType)
+			iam.IDPConfigRemovedEventType).
+		Builder()
 }
 
 func (wm *IAMIDPOIDCConfigWriteModel) NewChangedEvent(

internal/command/iam_member_model.go

@@ -54,12 +54,15 @@ func (wm *IAMMemberWriteModel) Reduce() error {
 }
 
 func (wm *IAMMemberWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, iam.AggregateType).
-		AggregateIDs(wm.MemberWriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(iam.AggregateType).
+		AggregateIDs(wm.MemberWriteModel.AggregateID).
 		EventTypes(
 			iam.MemberAddedEventType,
 			iam.MemberChangedEventType,
 			iam.MemberRemovedEventType,
-			iam.MemberCascadeRemovedEventType)
+			iam.MemberCascadeRemovedEventType).
+		Builder()
 }

internal/command/iam_model.go

@@ -44,14 +44,17 @@ func (wm *IAMWriteModel) Reduce() error {
 }
 
 func (wm *IAMWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, iam.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(iam.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(
 			iam.ProjectSetEventType,
 			iam.GlobalOrgSetEventType,
 			iam.SetupStartedEventType,
-			iam.SetupDoneEventType)
+			iam.SetupDoneEventType).
+		Builder()
 }
 
 func IAMAggregateFromWriteModel(wm *eventstore.WriteModel) *eventstore.Aggregate {

internal/command/iam_policy_label_model.go

@@ -62,9 +62,11 @@ func (wm *IAMLabelPolicyWriteModel) Reduce() error {
 }
 
 func (wm *IAMLabelPolicyWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, iam.AggregateType).
-		AggregateIDs(wm.LabelPolicyWriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(iam.AggregateType).
+		AggregateIDs(wm.LabelPolicyWriteModel.AggregateID).
 		EventTypes(
 			iam.LabelPolicyAddedEventType,
 			iam.LabelPolicyChangedEventType,
@@ -77,8 +79,8 @@ func (wm *IAMLabelPolicyWriteModel) Query() *eventstore.SearchQueryBuilder {
 			iam.LabelPolicyIconDarkAddedEventType,
 			iam.LabelPolicyIconDarkRemovedEventType,
 			iam.LabelPolicyFontAddedEventType,
-			iam.LabelPolicyFontRemovedEventType,
-		)
+			iam.LabelPolicyFontRemovedEventType).
+		Builder()
 }
 
 func (wm *IAMLabelPolicyWriteModel) NewChangedEvent(

internal/command/iam_policy_login_factors_model.go

@@ -42,12 +42,15 @@ func (wm *IAMSecondFactorWriteModel) Reduce() error {
 }
 
 func (wm *IAMSecondFactorWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, iam.AggregateType).
-		AggregateIDs(wm.WriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(iam.AggregateType).
+		AggregateIDs(wm.WriteModel.AggregateID).
 		EventTypes(
 			iam.LoginPolicySecondFactorAddedEventType,
-			iam.LoginPolicySecondFactorRemovedEventType)
+			iam.LoginPolicySecondFactorRemovedEventType).
+		Builder()
 }
 
 type IAMMultiFactorWriteModel struct {
@@ -86,10 +89,13 @@ func (wm *IAMMultiFactorWriteModel) Reduce() error {
 }
 
 func (wm *IAMMultiFactorWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, iam.AggregateType).
-		AggregateIDs(wm.WriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(iam.AggregateType).
+		AggregateIDs(wm.WriteModel.AggregateID).
 		EventTypes(
 			iam.LoginPolicyMultiFactorAddedEventType,
-			iam.LoginPolicyMultiFactorRemovedEventType)
+			iam.LoginPolicyMultiFactorRemovedEventType).
+		Builder()
 }

internal/command/iam_policy_login_identity_provider_model.go

@@ -44,7 +44,10 @@ func (wm *IAMIdentityProviderWriteModel) Reduce() error {
 }
 
 func (wm *IAMIdentityProviderWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, iam.AggregateType).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
+		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(iam.AggregateType).
 		AggregateIDs(wm.AggregateID).
-		ResourceOwner(wm.ResourceOwner)
+		Builder()
 }

internal/command/iam_policy_login_model.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+
 	"github.com/caos/zitadel/internal/eventstore"
 
 	"github.com/caos/zitadel/internal/domain"
@@ -44,12 +45,15 @@ func (wm *IAMLoginPolicyWriteModel) Reduce() error {
 }
 
 func (wm *IAMLoginPolicyWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, iam.AggregateType).
-		AggregateIDs(wm.LoginPolicyWriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(iam.AggregateType).
+		AggregateIDs(wm.LoginPolicyWriteModel.AggregateID).
 		EventTypes(
 			iam.LoginPolicyAddedEventType,
-			iam.LoginPolicyChangedEventType)
+			iam.LoginPolicyChangedEventType).
+		Builder()
 }
 
 func (wm *IAMLoginPolicyWriteModel) NewChangedEvent(

internal/command/iam_policy_mail_template_model.go

@@ -2,9 +2,10 @@ package command
 
 import (
 	"context"
-	"github.com/caos/zitadel/internal/eventstore"
 	"reflect"
 
+	"github.com/caos/zitadel/internal/eventstore"
+
 	"github.com/caos/zitadel/internal/domain"
 	"github.com/caos/zitadel/internal/repository/iam"
 	"github.com/caos/zitadel/internal/repository/policy"
@@ -41,12 +42,15 @@ func (wm *IAMMailTemplateWriteModel) Reduce() error {
 }
 
 func (wm *IAMMailTemplateWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, iam.AggregateType).
-		AggregateIDs(wm.MailTemplateWriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(iam.AggregateType).
+		AggregateIDs(wm.MailTemplateWriteModel.AggregateID).
 		EventTypes(
 			iam.MailTemplateAddedEventType,
-			iam.MailTemplateChangedEventType)
+			iam.MailTemplateChangedEventType).
+		Builder()
 }
 
 func (wm *IAMMailTemplateWriteModel) NewChangedEvent(

internal/command/iam_policy_org_iam_model.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+
 	"github.com/caos/zitadel/internal/eventstore"
 
 	"github.com/caos/zitadel/internal/domain"
@@ -40,12 +41,15 @@ func (wm *IAMOrgIAMPolicyWriteModel) Reduce() error {
 }
 
 func (wm *IAMOrgIAMPolicyWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, iam.AggregateType).
-		AggregateIDs(wm.PolicyOrgIAMWriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(iam.AggregateType).
+		AggregateIDs(wm.PolicyOrgIAMWriteModel.AggregateID).
 		EventTypes(
 			iam.OrgIAMPolicyAddedEventType,
-			iam.OrgIAMPolicyChangedEventType)
+			iam.OrgIAMPolicyChangedEventType).
+		Builder()
 }
 
 func (wm *IAMOrgIAMPolicyWriteModel) NewChangedEvent(

internal/command/iam_policy_password_age_model.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+
 	"github.com/caos/zitadel/internal/eventstore"
 
 	"github.com/caos/zitadel/internal/domain"
@@ -40,12 +41,15 @@ func (wm *IAMPasswordAgePolicyWriteModel) Reduce() error {
 }
 
 func (wm *IAMPasswordAgePolicyWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, iam.AggregateType).
-		AggregateIDs(wm.PasswordAgePolicyWriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(iam.AggregateType).
+		AggregateIDs(wm.PasswordAgePolicyWriteModel.AggregateID).
 		EventTypes(
 			iam.PasswordAgePolicyAddedEventType,
-			iam.PasswordAgePolicyChangedEventType)
+			iam.PasswordAgePolicyChangedEventType).
+		Builder()
 }
 
 func (wm *IAMPasswordAgePolicyWriteModel) NewChangedEvent(

internal/command/iam_policy_password_complexity_model.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+
 	"github.com/caos/zitadel/internal/eventstore"
 
 	"github.com/caos/zitadel/internal/domain"
@@ -40,12 +41,15 @@ func (wm *IAMPasswordComplexityPolicyWriteModel) Reduce() error {
 }
 
 func (wm *IAMPasswordComplexityPolicyWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, iam.AggregateType).
-		AggregateIDs(wm.PasswordComplexityPolicyWriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(iam.AggregateType).
+		AggregateIDs(wm.PasswordComplexityPolicyWriteModel.AggregateID).
 		EventTypes(
 			iam.PasswordComplexityPolicyAddedEventType,
-			iam.PasswordComplexityPolicyChangedEventType)
+			iam.PasswordComplexityPolicyChangedEventType).
+		Builder()
 }
 
 func (wm *IAMPasswordComplexityPolicyWriteModel) NewChangedEvent(

internal/command/iam_policy_password_lockout_model.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+
 	"github.com/caos/zitadel/internal/eventstore"
 
 	"github.com/caos/zitadel/internal/domain"
@@ -40,12 +41,15 @@ func (wm *IAMPasswordLockoutPolicyWriteModel) Reduce() error {
 }
 
 func (wm *IAMPasswordLockoutPolicyWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, iam.AggregateType).
-		AggregateIDs(wm.PasswordLockoutPolicyWriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(iam.AggregateType).
+		AggregateIDs(wm.PasswordLockoutPolicyWriteModel.AggregateID).
 		EventTypes(
 			iam.PasswordLockoutPolicyAddedEventType,
-			iam.PasswordLockoutPolicyChangedEventType)
+			iam.PasswordLockoutPolicyChangedEventType).
+		Builder()
 }
 
 func (wm *IAMPasswordLockoutPolicyWriteModel) NewChangedEvent(

internal/command/iam_policy_privacy_model.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+
 	"github.com/caos/zitadel/internal/eventstore"
 
 	"github.com/caos/zitadel/internal/domain"
@@ -40,12 +41,15 @@ func (wm *IAMPrivacyPolicyWriteModel) Reduce() error {
 }
 
 func (wm *IAMPrivacyPolicyWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, iam.AggregateType).
-		AggregateIDs(wm.PrivacyPolicyWriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(iam.AggregateType).
+		AggregateIDs(wm.PrivacyPolicyWriteModel.AggregateID).
 		EventTypes(
 			iam.PrivacyPolicyAddedEventType,
-			iam.PrivacyPolicyChangedEventType)
+			iam.PrivacyPolicyChangedEventType).
+		Builder()
 }
 
 func (wm *IAMPrivacyPolicyWriteModel) NewChangedEvent(

internal/command/key_pair_model.go

@@ -49,10 +49,13 @@ func (wm *KeyPairWriteModel) Reduce() error {
 }
 
 func (wm *KeyPairWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, project.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
-		EventTypes(keypair.AddedEventType)
+		AddQuery().
+		AggregateTypes(project.AggregateType).
+		AggregateIDs(wm.AggregateID).
+		EventTypes(keypair.AddedEventType).
+		Builder()
 }
 
 func KeyPairAggregateFromWriteModel(wm *eventstore.WriteModel) *eventstore.Aggregate {

internal/command/main_test.go

@@ -81,9 +81,11 @@ func (repo *testRepo) Filter(ctx context.Context, searchQuery *repository.Search
 	events := make([]*repository.Event, 0, len(repo.events))
 	for _, event := range repo.events {
 		for _, filter := range searchQuery.Filters {
-			if filter.Field == repository.FieldAggregateType {
-				if event.AggregateType != filter.Value {
-					continue
+			for _, f := range filter {
+				if f.Field == repository.FieldAggregateType {
+					if event.AggregateType != f.Value {
+						continue
+					}
 				}
 			}
 		}

internal/command/org_custom_login_text_model.go

@@ -41,11 +41,14 @@ func (wm *OrgCustomLoginTextReadModel) Reduce() error {
 }
 
 func (wm *OrgCustomLoginTextReadModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, org.AggregateType).
-		AggregateIDs(wm.CustomLoginTextReadModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateIDs(wm.CustomLoginTextReadModel.AggregateID).
+		AggregateTypes(org.AggregateType).
 		EventTypes(
 			org.CustomTextSetEventType,
 			org.CustomTextRemovedEventType,
-			org.CustomTextTemplateRemovedEventType)
+			org.CustomTextTemplateRemovedEventType).
+		Builder()
 }

internal/command/org_custom_message_model.go

@@ -42,13 +42,16 @@ func (wm *OrgCustomMessageTextReadModel) Reduce() error {
 }
 
 func (wm *OrgCustomMessageTextReadModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, org.AggregateType).
-		AggregateIDs(wm.CustomMessageTextReadModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(org.AggregateType).
+		AggregateIDs(wm.CustomMessageTextReadModel.AggregateID).
 		EventTypes(
 			org.CustomTextSetEventType,
 			org.CustomTextRemovedEventType,
-			org.CustomTextTemplateRemovedEventType)
+			org.CustomTextTemplateRemovedEventType).
+		Builder()
 }
 
 type OrgCustomMessageTemplatesReadModel struct {
@@ -85,11 +88,14 @@ func (wm *OrgCustomMessageTemplatesReadModel) Reduce() error {
 }
 
 func (wm *OrgCustomMessageTemplatesReadModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, org.AggregateType).
-		AggregateIDs(wm.CustomMessageTemplatesReadModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(org.AggregateType).
+		AggregateIDs(wm.CustomMessageTemplatesReadModel.AggregateID).
 		EventTypes(
 			org.CustomTextSetEventType,
 			org.CustomTextRemovedEventType,
-			org.CustomTextTemplateRemovedEventType)
+			org.CustomTextTemplateRemovedEventType).
+		Builder()
 }

internal/command/org_domain_model.go

@@ -84,16 +84,19 @@ func (wm *OrgDomainWriteModel) Reduce() error {
 }
 
 func (wm *OrgDomainWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, org.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(org.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(
 			org.OrgDomainAddedEventType,
 			org.OrgDomainVerifiedEventType,
 			org.OrgDomainVerificationAddedEventType,
 			org.OrgDomainVerifiedEventType,
 			org.OrgDomainPrimarySetEventType,
-			org.OrgDomainRemovedEventType)
+			org.OrgDomainRemovedEventType).
+		Builder()
 }
 
 type OrgDomainsWriteModel struct {
@@ -151,9 +154,11 @@ func (wm *OrgDomainsWriteModel) Reduce() error {
 }
 
 func (wm *OrgDomainsWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, org.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(org.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(
 			org.OrgAddedEventType,
 			org.OrgChangedEventType,
@@ -162,5 +167,6 @@ func (wm *OrgDomainsWriteModel) Query() *eventstore.SearchQueryBuilder {
 			org.OrgDomainVerificationAddedEventType,
 			org.OrgDomainVerifiedEventType,
 			org.OrgDomainPrimarySetEventType,
-			org.OrgDomainRemovedEventType)
+			org.OrgDomainRemovedEventType).
+		Builder()
 }

internal/command/org_features_model.go

@@ -45,13 +45,15 @@ func (wm *OrgFeaturesWriteModel) Reduce() error {
 }
 
 func (wm *OrgFeaturesWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, org.AggregateType).
-		AggregateIDs(wm.FeaturesWriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(org.AggregateType).
+		AggregateIDs(wm.FeaturesWriteModel.AggregateID).
 		EventTypes(
 			org.FeaturesSetEventType,
-			org.FeaturesRemovedEventType,
-		)
+			org.FeaturesRemovedEventType).
+		Builder()
 }
 
 func (wm *OrgFeaturesWriteModel) NewSetEvent(

internal/command/org_idp_config_model.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+
 	"github.com/caos/zitadel/internal/eventstore"
 
 	"github.com/caos/zitadel/internal/domain"
@@ -26,9 +27,11 @@ func NewOrgIDPConfigWriteModel(configID, orgID string) *OrgIDPConfigWriteModel {
 }
 
 func (wm *OrgIDPConfigWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, org.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(org.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(
 			org.IDPConfigAddedEventType,
 			org.IDPConfigChangedEventType,
@@ -36,7 +39,8 @@ func (wm *OrgIDPConfigWriteModel) Query() *eventstore.SearchQueryBuilder {
 			org.IDPConfigReactivatedEventType,
 			org.IDPConfigRemovedEventType,
 			org.IDPOIDCConfigAddedEventType,
-			org.IDPOIDCConfigChangedEventType)
+			org.IDPOIDCConfigChangedEventType).
+		Builder()
 }
 
 func (wm *OrgIDPConfigWriteModel) AppendEvents(events ...eventstore.EventReader) {

internal/command/org_idp_oidc_config_model.go

@@ -2,9 +2,10 @@ package command
 
 import (
 	"context"
-	"github.com/caos/zitadel/internal/eventstore"
 	"reflect"
 
+	"github.com/caos/zitadel/internal/eventstore"
+
 	"github.com/caos/zitadel/internal/crypto"
 	"github.com/caos/zitadel/internal/domain"
 	"github.com/caos/zitadel/internal/repository/idpconfig"
@@ -69,15 +70,18 @@ func (wm *IDPOIDCConfigWriteModel) Reduce() error {
 }
 
 func (wm *IDPOIDCConfigWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, org.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(org.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(
 			org.IDPOIDCConfigAddedEventType,
 			org.IDPOIDCConfigChangedEventType,
 			org.IDPConfigReactivatedEventType,
 			org.IDPConfigDeactivatedEventType,
-			org.IDPConfigRemovedEventType)
+			org.IDPConfigRemovedEventType).
+		Builder()
 }
 
 func (wm *IDPOIDCConfigWriteModel) NewChangedEvent(

internal/command/org_member_model.go

@@ -53,12 +53,15 @@ func (wm *OrgMemberWriteModel) Reduce() error {
 }
 
 func (wm *OrgMemberWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, org.AggregateType).
-		AggregateIDs(wm.MemberWriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(org.AggregateType).
+		AggregateIDs(wm.MemberWriteModel.AggregateID).
 		EventTypes(
 			org.MemberAddedEventType,
 			org.MemberChangedEventType,
 			org.MemberRemovedEventType,
-			org.MemberCascadeRemovedEventType)
+			org.MemberCascadeRemovedEventType).
+		Builder()
 }

internal/command/org_model.go

@@ -43,13 +43,16 @@ func (wm *OrgWriteModel) Reduce() error {
 }
 
 func (wm *OrgWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, org.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(org.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(
 			org.OrgAddedEventType,
 			org.OrgChangedEventType,
-			org.OrgDomainPrimarySetEventType)
+			org.OrgDomainPrimarySetEventType).
+		Builder()
 }
 
 func OrgAggregateFromWriteModel(wm *eventstore.WriteModel) *eventstore.Aggregate {

internal/command/org_policy_label_model.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+
 	"github.com/caos/zitadel/internal/eventstore"
 
 	"github.com/caos/zitadel/internal/repository/org"
@@ -61,9 +62,11 @@ func (wm *OrgLabelPolicyWriteModel) Reduce() error {
 }
 
 func (wm *OrgLabelPolicyWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, org.AggregateType).
-		AggregateIDs(wm.LabelPolicyWriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(org.AggregateType).
+		AggregateIDs(wm.LabelPolicyWriteModel.AggregateID).
 		EventTypes(
 			org.LabelPolicyAddedEventType,
 			org.LabelPolicyChangedEventType,
@@ -77,8 +80,8 @@ func (wm *OrgLabelPolicyWriteModel) Query() *eventstore.SearchQueryBuilder {
 			org.LabelPolicyIconDarkAddedEventType,
 			org.LabelPolicyIconDarkRemovedEventType,
 			org.LabelPolicyFontAddedEventType,
-			org.LabelPolicyFontRemovedEventType,
-		)
+			org.LabelPolicyFontRemovedEventType).
+		Builder()
 }
 
 func (wm *OrgLabelPolicyWriteModel) NewChangedEvent(

internal/command/org_policy_login_factors_model.go

@@ -43,12 +43,15 @@ func (wm *OrgSecondFactorWriteModel) Reduce() error {
 }
 
 func (wm *OrgSecondFactorWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, org.AggregateType).
-		AggregateIDs(wm.WriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(org.AggregateType).
+		AggregateIDs(wm.WriteModel.AggregateID).
 		EventTypes(
 			org.LoginPolicySecondFactorAddedEventType,
-			org.LoginPolicySecondFactorRemovedEventType)
+			org.LoginPolicySecondFactorRemovedEventType).
+		Builder()
 }
 
 type OrgMultiFactorWriteModel struct {
@@ -87,12 +90,15 @@ func (wm *OrgMultiFactorWriteModel) Reduce() error {
 }
 
 func (wm *OrgMultiFactorWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, org.AggregateType).
-		AggregateIDs(wm.WriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(org.AggregateType).
+		AggregateIDs(wm.WriteModel.AggregateID).
 		EventTypes(
 			org.LoginPolicyMultiFactorAddedEventType,
-			org.LoginPolicyMultiFactorRemovedEventType)
+			org.LoginPolicyMultiFactorRemovedEventType).
+		Builder()
 }
 
 func NewOrgAuthFactorsAllowedWriteModel(orgID string) *OrgAuthFactorsAllowedWriteModel {
@@ -164,17 +170,26 @@ func (wm *OrgAuthFactorsAllowedWriteModel) ensureMultiFactor(multiFactor domain.
 }
 
 func (wm *OrgAuthFactorsAllowedWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, iam.AggregateType, org.AggregateType).
-		AggregateIDs(domain.IAMID, wm.WriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
+		AddQuery().
+		AggregateTypes(iam.AggregateType).
+		AggregateIDs(domain.IAMID).
 		EventTypes(
 			iam.LoginPolicySecondFactorAddedEventType,
 			iam.LoginPolicySecondFactorRemovedEventType,
 			iam.LoginPolicyMultiFactorAddedEventType,
 			iam.LoginPolicyMultiFactorRemovedEventType,
+		).
+		Or().
+		AggregateTypes(org.AggregateType).
+		AggregateIDs(wm.WriteModel.AggregateID).
+		EventTypes(
 			org.LoginPolicySecondFactorAddedEventType,
 			org.LoginPolicySecondFactorRemovedEventType,
 			org.LoginPolicyMultiFactorAddedEventType,
-			org.LoginPolicyMultiFactorRemovedEventType)
+			org.LoginPolicyMultiFactorRemovedEventType,
+		).
+		Builder()
 }
 
 func (wm *OrgAuthFactorsAllowedWriteModel) ToSecondFactorWriteModel(factor domain.SecondFactorType) *OrgSecondFactorWriteModel {

internal/command/org_policy_login_identity_provider_model.go

@@ -43,10 +43,13 @@ func (wm *OrgIdentityProviderWriteModel) Reduce() error {
 }
 
 func (wm *OrgIdentityProviderWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, org.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(org.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(
 			org.LoginPolicyIDPProviderAddedEventType,
-			org.LoginPolicyIDPProviderRemovedEventType)
+			org.LoginPolicyIDPProviderRemovedEventType).
+		Builder()
 }

internal/command/org_policy_login_model.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+
 	"github.com/caos/zitadel/internal/eventstore"
 
 	"github.com/caos/zitadel/internal/domain"
@@ -46,13 +47,16 @@ func (wm *OrgLoginPolicyWriteModel) Reduce() error {
 }
 
 func (wm *OrgLoginPolicyWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, org.AggregateType).
-		AggregateIDs(wm.LoginPolicyWriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(org.AggregateType).
+		AggregateIDs(wm.LoginPolicyWriteModel.AggregateID).
 		EventTypes(
 			org.LoginPolicyAddedEventType,
 			org.LoginPolicyChangedEventType,
-			org.LoginPolicyRemovedEventType)
+			org.LoginPolicyRemovedEventType).
+		Builder()
 }
 
 func (wm *OrgLoginPolicyWriteModel) NewChangedEvent(

internal/command/org_policy_mail_template_model.go

@@ -2,9 +2,10 @@ package command
 
 import (
 	"context"
-	"github.com/caos/zitadel/internal/eventstore"
 	"reflect"
 
+	"github.com/caos/zitadel/internal/eventstore"
+
 	"github.com/caos/zitadel/internal/repository/org"
 	"github.com/caos/zitadel/internal/repository/policy"
 )
@@ -42,12 +43,15 @@ func (wm *OrgMailTemplateWriteModel) Reduce() error {
 }
 
 func (wm *OrgMailTemplateWriteModel) Query() *eventstore.SearchQueryBuilder {
-	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, org.AggregateType).
+	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
+		AddQuery().
+		AggregateTypes(org.AggregateType).
 		AggregateIDs(wm.MailTemplateWriteModel.AggregateID).
 		EventTypes(
 			org.MailTemplateAddedEventType,
 			org.MailTemplateChangedEventType,
-			org.MailTemplateRemovedEventType)
+			org.MailTemplateRemovedEventType).
+		Builder()
 
 	if wm.ResourceOwner != "" {
 		query.ResourceOwner(wm.ResourceOwner)

internal/command/org_policy_org_iam_model.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+
 	"github.com/caos/zitadel/internal/eventstore"
 
 	"github.com/caos/zitadel/internal/repository/org"
@@ -41,12 +42,15 @@ func (wm *ORGOrgIAMPolicyWriteModel) Reduce() error {
 }
 
 func (wm *ORGOrgIAMPolicyWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, org.AggregateType).
-		AggregateIDs(wm.PolicyOrgIAMWriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(org.AggregateType).
+		AggregateIDs(wm.PolicyOrgIAMWriteModel.AggregateID).
 		EventTypes(org.OrgIAMPolicyAddedEventType,
 			org.OrgIAMPolicyChangedEventType,
-			org.OrgIAMPolicyRemovedEventType)
+			org.OrgIAMPolicyRemovedEventType).
+		Builder()
 }
 
 func (wm *ORGOrgIAMPolicyWriteModel) NewChangedEvent(

internal/command/org_policy_password_age_model.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+
 	"github.com/caos/zitadel/internal/eventstore"
 
 	"github.com/caos/zitadel/internal/repository/org"
@@ -41,13 +42,16 @@ func (wm *OrgPasswordAgePolicyWriteModel) Reduce() error {
 }
 
 func (wm *OrgPasswordAgePolicyWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, org.AggregateType).
-		AggregateIDs(wm.PasswordAgePolicyWriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(org.AggregateType).
+		AggregateIDs(wm.PasswordAgePolicyWriteModel.AggregateID).
 		EventTypes(
 			org.PasswordAgePolicyAddedEventType,
 			org.PasswordAgePolicyChangedEventType,
-			org.PasswordAgePolicyRemovedEventType)
+			org.PasswordAgePolicyRemovedEventType).
+		Builder()
 }
 
 func (wm *OrgPasswordAgePolicyWriteModel) NewChangedEvent(

internal/command/org_policy_password_complexity_model.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+
 	"github.com/caos/zitadel/internal/eventstore"
 
 	"github.com/caos/zitadel/internal/repository/org"
@@ -41,12 +42,15 @@ func (wm *OrgPasswordComplexityPolicyWriteModel) Reduce() error {
 }
 
 func (wm *OrgPasswordComplexityPolicyWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, org.AggregateType).
-		AggregateIDs(wm.PasswordComplexityPolicyWriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(org.AggregateType).
+		AggregateIDs(wm.PasswordComplexityPolicyWriteModel.AggregateID).
 		EventTypes(org.PasswordComplexityPolicyAddedEventType,
 			org.PasswordComplexityPolicyChangedEventType,
-			org.PasswordComplexityPolicyRemovedEventType)
+			org.PasswordComplexityPolicyRemovedEventType).
+		Builder()
 }
 
 func (wm *OrgPasswordComplexityPolicyWriteModel) NewChangedEvent(

internal/command/org_policy_password_lockout_model.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+
 	"github.com/caos/zitadel/internal/eventstore"
 
 	"github.com/caos/zitadel/internal/repository/org"
@@ -41,12 +42,15 @@ func (wm *OrgPasswordLockoutPolicyWriteModel) Reduce() error {
 }
 
 func (wm *OrgPasswordLockoutPolicyWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, org.AggregateType).
-		AggregateIDs(wm.PasswordLockoutPolicyWriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(org.AggregateType).
+		AggregateIDs(wm.PasswordLockoutPolicyWriteModel.AggregateID).
 		EventTypes(org.PasswordLockoutPolicyAddedEventType,
 			org.PasswordLockoutPolicyChangedEventType,
-			org.PasswordLockoutPolicyRemovedEventType)
+			org.PasswordLockoutPolicyRemovedEventType).
+		Builder()
 }
 
 func (wm *OrgPasswordLockoutPolicyWriteModel) NewChangedEvent(

internal/command/org_policy_privacy_model.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+
 	"github.com/caos/zitadel/internal/eventstore"
 
 	"github.com/caos/zitadel/internal/repository/org"
@@ -41,12 +42,15 @@ func (wm *OrgPrivacyPolicyWriteModel) Reduce() error {
 }
 
 func (wm *OrgPrivacyPolicyWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, org.AggregateType).
-		AggregateIDs(wm.PrivacyPolicyWriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateIDs(wm.PrivacyPolicyWriteModel.AggregateID).
+		AggregateTypes(org.AggregateType).
 		EventTypes(org.PrivacyPolicyAddedEventType,
 			org.PrivacyPolicyChangedEventType,
-			org.PrivacyPolicyRemovedEventType)
+			org.PrivacyPolicyRemovedEventType).
+		Builder()
 }
 
 func (wm *OrgPrivacyPolicyWriteModel) NewChangedEvent(

internal/command/project_application_api_model.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+
 	"github.com/caos/zitadel/internal/eventstore"
 
 	"github.com/caos/zitadel/internal/crypto"
@@ -136,9 +137,11 @@ func (wm *APIApplicationWriteModel) appendChangeAPIEvent(e *project.APIConfigCha
 }
 
 func (wm *APIApplicationWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, project.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(project.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(
 			project.ApplicationAddedType,
 			project.ApplicationChangedType,
@@ -148,8 +151,8 @@ func (wm *APIApplicationWriteModel) Query() *eventstore.SearchQueryBuilder {
 			project.APIConfigAddedType,
 			project.APIConfigChangedType,
 			project.APIConfigSecretChangedType,
-			project.ProjectRemovedType,
-		)
+			project.ProjectRemovedType).
+		Builder()
 }
 
 func (wm *APIApplicationWriteModel) NewChangedEvent(

internal/command/project_application_key_model.go

@@ -1,9 +1,10 @@
 package command
 
 import (
-	"github.com/caos/zitadel/internal/eventstore"
 	"time"
 
+	"github.com/caos/zitadel/internal/eventstore"
+
 	"github.com/caos/zitadel/internal/domain"
 	"github.com/caos/zitadel/internal/repository/project"
 )
@@ -126,9 +127,11 @@ func (wm *ApplicationKeyWriteModel) appendChangeAPIEvent(e *project.APIConfigCha
 }
 
 func (wm *ApplicationKeyWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, project.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(project.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(
 			project.ApplicationRemovedType,
 			project.OIDCConfigAddedType,
@@ -137,6 +140,6 @@ func (wm *ApplicationKeyWriteModel) Query() *eventstore.SearchQueryBuilder {
 			project.APIConfigChangedType,
 			project.ApplicationKeyAddedEventType,
 			project.ApplicationKeyRemovedEventType,
-			project.ProjectRemovedType,
-		)
+			project.ProjectRemovedType).
+		Builder()
 }

internal/command/project_application_model.go

@@ -94,15 +94,17 @@ func (wm *ApplicationWriteModel) Reduce() error {
 }
 
 func (wm *ApplicationWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, project.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(project.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(
 			project.ApplicationAddedType,
 			project.ApplicationChangedType,
 			project.ApplicationDeactivatedType,
 			project.ApplicationReactivatedType,
 			project.ApplicationRemovedType,
-			project.ProjectRemovedType,
-		)
+			project.ProjectRemovedType).
+		Builder()
 }

internal/command/project_application_oidc_model.go

@@ -2,12 +2,13 @@ package command
 
 import (
 	"context"
+	"reflect"
+	"time"
+
 	"github.com/caos/zitadel/internal/crypto"
 	"github.com/caos/zitadel/internal/domain"
 	"github.com/caos/zitadel/internal/eventstore"
 	"github.com/caos/zitadel/internal/repository/project"
-	"reflect"
-	"time"
 )
 
 type OIDCApplicationWriteModel struct {
@@ -203,9 +204,11 @@ func (wm *OIDCApplicationWriteModel) appendChangeOIDCEvent(e *project.OIDCConfig
 }
 
 func (wm *OIDCApplicationWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, project.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(project.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(
 			project.ApplicationAddedType,
 			project.ApplicationChangedType,
@@ -215,8 +218,8 @@ func (wm *OIDCApplicationWriteModel) Query() *eventstore.SearchQueryBuilder {
 			project.OIDCConfigAddedType,
 			project.OIDCConfigChangedType,
 			project.OIDCConfigSecretChangedType,
-			project.ProjectRemovedType,
-		)
+			project.ProjectRemovedType).
+		Builder()
 }
 
 func (wm *OIDCApplicationWriteModel) NewChangedEvent(

internal/command/project_grant_member_model.go

@@ -80,7 +80,9 @@ func (wm *ProjectGrantMemberWriteModel) Reduce() error {
 }
 
 func (wm *ProjectGrantMemberWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, project.AggregateType).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
+		AddQuery().
+		AggregateTypes(project.AggregateType).
 		AggregateIDs(wm.AggregateID).
 		EventTypes(
 			project.GrantMemberAddedType,
@@ -88,5 +90,6 @@ func (wm *ProjectGrantMemberWriteModel) Query() *eventstore.SearchQueryBuilder {
 			project.GrantMemberRemovedType,
 			project.GrantMemberCascadeRemovedType,
 			project.GrantRemovedType,
-			project.ProjectRemovedType)
+			project.ProjectRemovedType).
+		Builder()
 }

internal/command/project_grant_model.go

@@ -91,7 +91,9 @@ func (wm *ProjectGrantWriteModel) Reduce() error {
 }
 
 func (wm *ProjectGrantWriteModel) Query() *eventstore.SearchQueryBuilder {
-	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, project.AggregateType).
+	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
+		AddQuery().
+		AggregateTypes(project.AggregateType).
 		AggregateIDs(wm.AggregateID).
 		EventTypes(
 			project.GrantAddedType,
@@ -100,7 +102,9 @@ func (wm *ProjectGrantWriteModel) Query() *eventstore.SearchQueryBuilder {
 			project.GrantDeactivatedType,
 			project.GrantReactivatedType,
 			project.GrantRemovedType,
-			project.ProjectRemovedType)
+			project.ProjectRemovedType).
+		Builder()
+
 	if wm.ResourceOwner != "" {
 		query.ResourceOwner(wm.ResourceOwner)
 	}
@@ -152,14 +156,22 @@ func (wm *ProjectGrantPreConditionReadModel) Reduce() error {
 }
 
 func (wm *ProjectGrantPreConditionReadModel) Query() *eventstore.SearchQueryBuilder {
-	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, org.AggregateType, project.AggregateType).
-		AggregateIDs(wm.ProjectID, wm.GrantedOrgID).
+	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
+		AddQuery().
+		AggregateTypes(org.AggregateType).
+		AggregateIDs(wm.GrantedOrgID).
 		EventTypes(
 			org.OrgAddedEventType,
-			org.OrgRemovedEventType,
+			org.OrgRemovedEventType).
+		Or().
+		AggregateTypes(project.AggregateType).
+		AggregateIDs(wm.ProjectID).
+		EventTypes(
 			project.ProjectAddedType,
 			project.ProjectRemovedType,
 			project.RoleAddedType,
-			project.RoleRemovedType)
+			project.RoleRemovedType).
+		Builder()
+
 	return query
 }

internal/command/project_member_model.go

@@ -53,11 +53,14 @@ func (wm *ProjectMemberWriteModel) Reduce() error {
 }
 
 func (wm *ProjectMemberWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, project.AggregateType).
-		AggregateIDs(wm.MemberWriteModel.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(project.AggregateType).
+		AggregateIDs(wm.MemberWriteModel.AggregateID).
 		EventTypes(project.MemberAddedType,
 			project.MemberChangedType,
 			project.MemberRemovedType,
-			project.MemberCascadeRemovedType)
+			project.MemberCascadeRemovedType).
+		Builder()
 }

internal/command/project_model.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+
 	"github.com/caos/zitadel/internal/domain"
 	"github.com/caos/zitadel/internal/eventstore"
 	"github.com/caos/zitadel/internal/repository/project"
@@ -61,14 +62,17 @@ func (wm *ProjectWriteModel) Reduce() error {
 }
 
 func (wm *ProjectWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, project.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(project.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(project.ProjectAddedType,
 			project.ProjectChangedType,
 			project.ProjectDeactivatedType,
 			project.ProjectReactivatedType,
-			project.ProjectRemovedType)
+			project.ProjectRemovedType).
+		Builder()
 }
 
 func (wm *ProjectWriteModel) NewChangedEvent(

internal/command/project_role_model.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+
 	"github.com/caos/zitadel/internal/domain"
 	"github.com/caos/zitadel/internal/eventstore"
 	"github.com/caos/zitadel/internal/repository/project"
@@ -82,14 +83,17 @@ func (wm *ProjectRoleWriteModel) Reduce() error {
 }
 
 func (wm *ProjectRoleWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, project.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(project.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(
 			project.RoleAddedType,
 			project.RoleChangedType,
 			project.RoleRemovedType,
-			project.ProjectRemovedType)
+			project.ProjectRemovedType).
+		Builder()
 }
 
 func (wm *ProjectRoleWriteModel) NewProjectRoleChangedEvent(

internal/command/unique_constraints_model.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+
 	"github.com/caos/logging"
 	"github.com/caos/zitadel/internal/domain"
 	"github.com/caos/zitadel/internal/eventstore"
@@ -181,8 +182,8 @@ func (rm *UniqueConstraintReadModel) Reduce() error {
 }
 
 func (rm *UniqueConstraintReadModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(
-		eventstore.ColumnsEvent,
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
+		AddQuery().AggregateTypes(
 		iam.AggregateType,
 		org.AggregateType,
 		project.AggregateType,
@@ -237,8 +238,8 @@ func (rm *UniqueConstraintReadModel) Query() *eventstore.SearchQueryBuilder {
 			org.MemberCascadeRemovedEventType,
 			project.MemberAddedType,
 			project.MemberRemovedType,
-			project.MemberCascadeRemovedType,
-		)
+			project.MemberCascadeRemovedType).
+		Builder()
 }
 
 func (rm *UniqueConstraintReadModel) getUniqueConstraint(aggregateID, objectID, constraintType string) *domain.UniqueConstraintMigration {

internal/command/user_grant_model.go

@@ -60,7 +60,9 @@ func (wm *UserGrantWriteModel) Reduce() error {
 }
 
 func (wm *UserGrantWriteModel) Query() *eventstore.SearchQueryBuilder {
-	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, usergrant.AggregateType).
+	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
+		AddQuery().
+		AggregateTypes(usergrant.AggregateType).
 		AggregateIDs(wm.AggregateID).
 		EventTypes(usergrant.UserGrantAddedType,
 			usergrant.UserGrantChangedType,
@@ -68,7 +70,9 @@ func (wm *UserGrantWriteModel) Query() *eventstore.SearchQueryBuilder {
 			usergrant.UserGrantDeactivatedType,
 			usergrant.UserGrantReactivatedType,
 			usergrant.UserGrantRemovedType,
-			usergrant.UserGrantCascadeRemovedType)
+			usergrant.UserGrantCascadeRemovedType).
+		Builder()
+
 	if wm.ResourceOwner != "" {
 		query.ResourceOwner(wm.ResourceOwner)
 	}
@@ -152,20 +156,28 @@ func (wm *UserGrantPreConditionReadModel) Reduce() error {
 }
 
 func (wm *UserGrantPreConditionReadModel) Query() *eventstore.SearchQueryBuilder {
-	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType, project.AggregateType).
-		AggregateIDs(wm.UserID, wm.ProjectID).
-		EventTypes(user.UserV1AddedType,
+	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
+		AddQuery().
+		AggregateTypes(user.AggregateType).
+		AggregateIDs(wm.UserID).
+		EventTypes(
+			user.UserV1AddedType,
 			user.HumanAddedType,
 			user.UserV1RegisteredType,
 			user.HumanRegisteredType,
 			user.MachineAddedEventType,
-			user.UserRemovedType,
+			user.UserRemovedType).
+		Or().
+		AggregateTypes(project.AggregateType).
+		AggregateIDs(wm.ProjectID).
+		EventTypes(
 			project.ProjectAddedType,
 			project.ProjectRemovedType,
 			project.GrantAddedType,
 			project.GrantChangedType,
 			project.GrantRemovedType,
 			project.RoleAddedType,
-			project.RoleRemovedType)
+			project.RoleRemovedType).
+		Builder()
 	return query
 }

internal/command/user_human_address_model.go

@@ -70,16 +70,19 @@ func (wm *HumanAddressWriteModel) Reduce() error {
 }
 
 func (wm *HumanAddressWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(user.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(user.UserV1AddedType,
 			user.UserV1RegisteredType,
 			user.UserV1AddressChangedType,
 			user.HumanAddedType,
 			user.HumanRegisteredType,
 			user.HumanAddressChangedType,
-			user.UserRemovedType)
+			user.UserRemovedType).
+		Builder()
 }
 
 func (wm *HumanAddressWriteModel) NewChangedEvent(

internal/command/user_human_email_model.go

@@ -65,7 +65,9 @@ func (wm *HumanEmailWriteModel) Reduce() error {
 }
 
 func (wm *HumanEmailWriteModel) Query() *eventstore.SearchQueryBuilder {
-	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType).
+	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
+		AddQuery().
+		AggregateTypes(user.AggregateType).
 		AggregateIDs(wm.AggregateID).
 		EventTypes(user.UserV1AddedType,
 			user.HumanAddedType,
@@ -81,7 +83,9 @@ func (wm *HumanEmailWriteModel) Query() *eventstore.SearchQueryBuilder {
 			user.HumanEmailCodeAddedType,
 			user.UserV1EmailVerifiedType,
 			user.HumanEmailVerifiedType,
-			user.UserRemovedType)
+			user.UserRemovedType).
+		Builder()
+
 	if wm.ResourceOwner != "" {
 		query.ResourceOwner(wm.ResourceOwner)
 	}

internal/command/user_human_externalidp_model.go

@@ -47,11 +47,14 @@ func (wm *HumanExternalIDPWriteModel) Reduce() error {
 }
 
 func (wm *HumanExternalIDPWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(user.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(user.HumanExternalIDPAddedType,
 			user.HumanExternalIDPRemovedType,
 			user.HumanExternalIDPCascadeRemovedType,
-			user.UserRemovedType)
+			user.UserRemovedType).
+		Builder()
 }

internal/command/user_human_init_model.go

@@ -2,9 +2,10 @@ package command
 
 import (
 	"context"
-	"github.com/caos/zitadel/internal/eventstore"
 	"time"
 
+	"github.com/caos/zitadel/internal/eventstore"
+
 	"github.com/caos/zitadel/internal/crypto"
 	"github.com/caos/zitadel/internal/domain"
 	"github.com/caos/zitadel/internal/repository/user"
@@ -66,7 +67,9 @@ func (wm *HumanInitCodeWriteModel) Reduce() error {
 }
 
 func (wm *HumanInitCodeWriteModel) Query() *eventstore.SearchQueryBuilder {
-	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType).
+	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
+		AddQuery().
+		AggregateTypes(user.AggregateType).
 		AggregateIDs(wm.AggregateID).
 		EventTypes(user.UserV1AddedType,
 			user.HumanAddedType,
@@ -80,7 +83,9 @@ func (wm *HumanInitCodeWriteModel) Query() *eventstore.SearchQueryBuilder {
 			user.HumanInitialCodeAddedType,
 			user.UserV1InitializedCheckSucceededType,
 			user.HumanInitializedCheckSucceededType,
-			user.UserRemovedType)
+			user.UserRemovedType).
+		Builder()
+
 	if wm.ResourceOwner != "" {
 		query.ResourceOwner(wm.ResourceOwner)
 	}

internal/command/user_human_model.go

@@ -104,9 +104,11 @@ func (wm *HumanWriteModel) Reduce() error {
 }
 
 func (wm *HumanWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(user.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(user.HumanAddedType,
 			user.HumanRegisteredType,
 			user.HumanInitialCodeAddedType,
@@ -136,7 +138,8 @@ func (wm *HumanWriteModel) Query() *eventstore.SearchQueryBuilder {
 			user.UserV1PhoneChangedType,
 			user.UserV1PhoneVerifiedType,
 			user.UserV1PhoneRemovedType,
-			user.UserV1PasswordChangedType)
+			user.UserV1PasswordChangedType).
+		Builder()
 }
 
 func (wm *HumanWriteModel) reduceHumanAddedEvent(e *user.HumanAddedEvent) {

internal/command/user_human_otp_model.go

@@ -41,7 +41,9 @@ func (wm *HumanOTPWriteModel) Reduce() error {
 }
 
 func (wm *HumanOTPWriteModel) Query() *eventstore.SearchQueryBuilder {
-	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType).
+	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
+		AddQuery().
+		AggregateTypes(user.AggregateType).
 		AggregateIDs(wm.AggregateID).
 		EventTypes(user.HumanMFAOTPAddedType,
 			user.HumanMFAOTPVerifiedType,
@@ -49,7 +51,9 @@ func (wm *HumanOTPWriteModel) Query() *eventstore.SearchQueryBuilder {
 			user.UserRemovedType,
 			user.UserV1MFAOTPAddedType,
 			user.UserV1MFAOTPVerifiedType,
-			user.UserV1MFAOTPRemovedType)
+			user.UserV1MFAOTPRemovedType).
+		Builder()
+
 	if wm.ResourceOwner != "" {
 		query.ResourceOwner(wm.ResourceOwner)
 	}

internal/command/user_human_password_model.go

@@ -1,9 +1,10 @@
 package command
 
 import (
-	"github.com/caos/zitadel/internal/eventstore"
 	"time"
 
+	"github.com/caos/zitadel/internal/eventstore"
+
 	"github.com/caos/zitadel/internal/crypto"
 	"github.com/caos/zitadel/internal/domain"
 	"github.com/caos/zitadel/internal/repository/user"
@@ -66,7 +67,9 @@ func (wm *HumanPasswordWriteModel) Reduce() error {
 }
 
 func (wm *HumanPasswordWriteModel) Query() *eventstore.SearchQueryBuilder {
-	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType).
+	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
+		AddQuery().
+		AggregateTypes(user.AggregateType).
 		AggregateIDs(wm.AggregateID).
 		EventTypes(user.HumanAddedType,
 			user.HumanRegisteredType,
@@ -82,7 +85,9 @@ func (wm *HumanPasswordWriteModel) Query() *eventstore.SearchQueryBuilder {
 			user.UserV1InitializedCheckSucceededType,
 			user.UserV1PasswordChangedType,
 			user.UserV1PasswordCodeAddedType,
-			user.UserV1EmailVerifiedType)
+			user.UserV1EmailVerifiedType).
+		Builder()
+
 	if wm.ResourceOwner != "" {
 		query.ResourceOwner(wm.ResourceOwner)
 	}

internal/command/user_human_phone_model.go

@@ -2,9 +2,10 @@ package command
 
 import (
 	"context"
-	"github.com/caos/zitadel/internal/eventstore"
 	"time"
 
+	"github.com/caos/zitadel/internal/eventstore"
+
 	"github.com/caos/zitadel/internal/crypto"
 	"github.com/caos/zitadel/internal/domain"
 	"github.com/caos/zitadel/internal/repository/user"
@@ -74,9 +75,11 @@ func (wm *HumanPhoneWriteModel) Reduce() error {
 }
 
 func (wm *HumanPhoneWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(user.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(user.HumanAddedType,
 			user.HumanRegisteredType,
 			user.HumanInitialCodeAddedType,
@@ -93,7 +96,8 @@ func (wm *HumanPhoneWriteModel) Query() *eventstore.SearchQueryBuilder {
 			user.UserV1PhoneCodeAddedType,
 			user.UserV1PhoneChangedType,
 			user.UserV1PhoneVerifiedType,
-			user.UserV1PhoneRemovedType)
+			user.UserV1PhoneRemovedType).
+		Builder()
 }
 
 func (wm *HumanPhoneWriteModel) NewChangedEvent(

internal/command/user_human_profile_model.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+
 	"github.com/caos/zitadel/internal/eventstore"
 
 	"golang.org/x/text/language"
@@ -78,16 +79,19 @@ func (wm *HumanProfileWriteModel) Reduce() error {
 }
 
 func (wm *HumanProfileWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(user.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(user.HumanAddedType,
 			user.HumanRegisteredType,
 			user.HumanProfileChangedType,
 			user.UserRemovedType,
 			user.UserV1AddedType,
 			user.UserV1RegisteredType,
-			user.UserV1ProfileChangedType)
+			user.UserV1ProfileChangedType).
+		Builder()
 }
 
 func (wm *HumanProfileWriteModel) NewChangedEvent(

internal/command/user_human_refresh_token_model.go

@@ -75,13 +75,17 @@ func (wm *HumanRefreshTokenWriteModel) Reduce() error {
 }
 
 func (wm *HumanRefreshTokenWriteModel) Query() *eventstore.SearchQueryBuilder {
-	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType).
+	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
+		AddQuery().
+		AggregateTypes(user.AggregateType).
 		AggregateIDs(wm.AggregateID).
 		EventTypes(
 			user.HumanRefreshTokenAddedType,
 			user.HumanRefreshTokenRenewedType,
 			user.HumanRefreshTokenRemovedType,
-			user.UserRemovedType)
+			user.UserRemovedType).
+		Builder()
+
 	if wm.ResourceOwner != "" {
 		query.ResourceOwner(wm.ResourceOwner)
 	}

internal/command/user_human_webauthn_model.go

@@ -124,9 +124,11 @@ func (wm *HumanWebAuthNWriteModel) appendVerifiedEvent(e *user.HumanWebAuthNVeri
 }
 
 func (wm *HumanWebAuthNWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(user.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(user.HumanU2FTokenAddedType,
 			user.HumanPasswordlessTokenAddedType,
 			user.HumanU2FTokenAddedType,
@@ -135,7 +137,8 @@ func (wm *HumanWebAuthNWriteModel) Query() *eventstore.SearchQueryBuilder {
 			user.HumanPasswordlessTokenSignCountChangedType,
 			user.HumanU2FTokenRemovedType,
 			user.HumanPasswordlessTokenRemovedType,
-			user.UserRemovedType)
+			user.UserRemovedType).
+		Builder()
 }
 
 type HumanU2FTokensReadModel struct {
@@ -199,13 +202,16 @@ func (wm *HumanU2FTokensReadModel) Reduce() error {
 }
 
 func (rm *HumanU2FTokensReadModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType).
-		AggregateIDs(rm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(rm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(user.AggregateType).
+		AggregateIDs(rm.AggregateID).
 		EventTypes(
 			user.HumanU2FTokenAddedType,
 			user.HumanU2FTokenVerifiedType,
-			user.HumanU2FTokenRemovedType)
+			user.HumanU2FTokenRemovedType).
+		Builder()
 
 }
 
@@ -279,13 +285,16 @@ func (wm *HumanPasswordlessTokensReadModel) Reduce() error {
 }
 
 func (rm *HumanPasswordlessTokensReadModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType).
-		AggregateIDs(rm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(rm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(user.AggregateType).
+		AggregateIDs(rm.AggregateID).
 		EventTypes(
 			user.HumanPasswordlessTokenAddedType,
 			user.HumanPasswordlessTokenVerifiedType,
-			user.HumanPasswordlessTokenRemovedType)
+			user.HumanPasswordlessTokenRemovedType).
+		Builder()
 
 }
 
@@ -349,13 +358,15 @@ func (wm *HumanU2FLoginReadModel) Reduce() error {
 }
 
 func (rm *HumanU2FLoginReadModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType).
-		AggregateIDs(rm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(rm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(user.AggregateType).
+		AggregateIDs(rm.AggregateID).
 		EventTypes(
 			user.HumanU2FTokenBeginLoginType,
-			user.UserRemovedType,
-		)
+			user.UserRemovedType).
+		Builder()
 }
 
 type HumanPasswordlessLoginReadModel struct {
@@ -408,12 +419,14 @@ func (wm *HumanPasswordlessLoginReadModel) Reduce() error {
 }
 
 func (rm *HumanPasswordlessLoginReadModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType).
-		AggregateIDs(rm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(rm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(user.AggregateType).
+		AggregateIDs(rm.AggregateID).
 		EventTypes(
 			user.HumanPasswordlessTokenBeginLoginType,
-			user.UserRemovedType,
-		)
+			user.UserRemovedType).
+		Builder()
 
 }

internal/command/user_machine_key_model.go

@@ -1,9 +1,10 @@
 package command
 
 import (
-	"github.com/caos/zitadel/internal/eventstore"
 	"time"
 
+	"github.com/caos/zitadel/internal/eventstore"
+
 	"github.com/caos/zitadel/internal/domain"
 	"github.com/caos/zitadel/internal/repository/user"
 )
@@ -65,13 +66,16 @@ func (wm *MachineKeyWriteModel) Reduce() error {
 }
 
 func (wm *MachineKeyWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(user.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(
 			user.MachineKeyAddedEventType,
 			user.MachineKeyRemovedEventType,
-			user.UserRemovedType)
+			user.UserRemovedType).
+		Builder()
 }
 
 func (wm *MachineKeyWriteModel) Exists() bool {

internal/command/user_machine_model.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+
 	"github.com/caos/zitadel/internal/eventstore"
 
 	"github.com/caos/zitadel/internal/domain"
@@ -68,9 +69,11 @@ func (wm *MachineWriteModel) Reduce() error {
 }
 
 func (wm *MachineWriteModel) Query() *eventstore.SearchQueryBuilder {
-	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType).
-		AggregateIDs(wm.AggregateID).
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
 		ResourceOwner(wm.ResourceOwner).
+		AddQuery().
+		AggregateTypes(user.AggregateType).
+		AggregateIDs(wm.AggregateID).
 		EventTypes(user.MachineAddedEventType,
 			user.UserUserNameChangedType,
 			user.MachineChangedEventType,
@@ -78,7 +81,8 @@ func (wm *MachineWriteModel) Query() *eventstore.SearchQueryBuilder {
 			user.UserUnlockedType,
 			user.UserDeactivatedType,
 			user.UserReactivatedType,
-			user.UserRemovedType)
+			user.UserRemovedType).
+		Builder()
 }
 
 func (wm *MachineWriteModel) NewChangedEvent(

internal/command/user_model.go

@@ -1,9 +1,10 @@
 package command
 
 import (
-	"github.com/caos/zitadel/internal/eventstore"
 	"strings"
 
+	"github.com/caos/zitadel/internal/eventstore"
+
 	"github.com/caos/zitadel/internal/domain"
 	caos_errors "github.com/caos/zitadel/internal/errors"
 	"github.com/caos/zitadel/internal/repository/user"
@@ -67,7 +68,9 @@ func (wm *UserWriteModel) Reduce() error {
 }
 
 func (wm *UserWriteModel) Query() *eventstore.SearchQueryBuilder {
-	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, user.AggregateType).
+	query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
+		AddQuery().
+		AggregateTypes(user.AggregateType).
 		AggregateIDs(wm.AggregateID).
 		EventTypes(
 			user.HumanAddedType,
@@ -83,7 +86,9 @@ func (wm *UserWriteModel) Query() *eventstore.SearchQueryBuilder {
 			user.UserRemovedType,
 			user.UserV1AddedType,
 			user.UserV1RegisteredType,
-			user.UserV1InitializedCheckSucceededType)
+			user.UserV1InitializedCheckSucceededType).
+		Builder()
+
 	if wm.ResourceOwner != "" {
 		query.ResourceOwner(wm.ResourceOwner)
 	}