From 26ad99c032ca601c6b608e3ec2fd8f14a594cffd Mon Sep 17 00:00:00 2001
From: hc-github-team-tf-azure <>
Date: Fri, 28 Jul 2023 07:37:28 +0000
Subject: [PATCH] Updating based on acfa755d3

---
 .../2021-05-01/domainservices/predicates.go   |  10 +-
 .../aad/2021-05-01/oucontainer/predicates.go  |  10 +-
 .../2021-04-01-preview/tenants/predicates.go  |   6 +-
 .../2020-01-01/configurations/predicates.go   |   6 +-
 .../getrecommendations/predicates.go          |   6 +-
 .../advisor/2020-01-01/metadata/predicates.go |   6 +-
 .../2020-01-01/suppressions/predicates.go     |   6 +-
 .../2022-10-01/configurations/predicates.go   |   6 +-
 .../getrecommendations/predicates.go          |   6 +-
 .../advisor/2022-10-01/metadata/predicates.go |   6 +-
 .../2022-10-01/suppressions/predicates.go     |   6 +-
 .../2023-01-01/configurations/predicates.go   |   6 +-
 .../getrecommendations/predicates.go          |   6 +-
 .../advisor/2023-01-01/metadata/predicates.go |   6 +-
 .../2023-01-01/suppressions/predicates.go     |   6 +-
 .../alertprocessingrules/predicates.go        |   6 +-
 .../2021-08-01/api/predicates.go              |   6 +-
 .../2021-08-01/apidiagnostic/predicates.go    |   6 +-
 .../2021-08-01/apiissue/predicates.go         |   6 +-
 .../apiissueattachment/predicates.go          |   6 +-
 .../2021-08-01/apiissuecomment/predicates.go  |   6 +-
 .../apimanagementservice/predicates.go        |   8 +-
 .../apimanagementserviceskus/predicates.go    |   2 +-
 .../2021-08-01/apioperation/predicates.go     |   6 +-
 .../2021-08-01/apioperationtag/predicates.go  |   6 +-
 .../2021-08-01/apiproduct/predicates.go       |   6 +-
 .../2021-08-01/apirelease/predicates.go       |   6 +-
 .../2021-08-01/apirevision/predicates.go      |  16 +-
 .../2021-08-01/apischema/predicates.go        |   6 +-
 .../2021-08-01/apitag/predicates.go           |   6 +-
 .../apitagdescription/predicates.go           |   6 +-
 .../2021-08-01/apiversionset/predicates.go    |   6 +-
 .../authorizationserver/predicates.go         |   6 +-
 .../2021-08-01/backend/predicates.go          |   6 +-
 .../2021-08-01/cache/predicates.go            |   6 +-
 .../2021-08-01/certificate/predicates.go      |   6 +-
 .../2021-08-01/contenttype/predicates.go      |   6 +-
 .../contenttypecontentitem/predicates.go      |   8 +-
 .../2021-08-01/deletedservice/predicates.go   |   8 +-
 .../2021-08-01/diagnostic/predicates.go       |   6 +-
 .../2021-08-01/emailtemplate/predicates.go    |   6 +-
 .../2021-08-01/gateway/predicates.go          |   6 +-
 .../2021-08-01/gatewayapi/predicates.go       |   6 +-
 .../gatewaycertificateauthority/predicates.go |   6 +-
 .../predicates.go                             |   6 +-
 .../2021-08-01/group/predicates.go            |   6 +-
 .../2021-08-01/groupuser/predicates.go        |   6 +-
 .../2021-08-01/identityprovider/predicates.go |   6 +-
 .../2021-08-01/issue/predicates.go            |   6 +-
 .../2021-08-01/logger/predicates.go           |   6 +-
 .../2021-08-01/namedvalue/predicates.go       |   6 +-
 .../2021-08-01/notification/predicates.go     |   6 +-
 .../openidconnectprovider/predicates.go       |   6 +-
 .../2021-08-01/portalrevision/predicates.go   |   6 +-
 .../2021-08-01/product/predicates.go          |   6 +-
 .../2021-08-01/productapi/predicates.go       |   6 +-
 .../2021-08-01/productgroup/predicates.go     |   6 +-
 .../productsubscription/predicates.go         |   6 +-
 .../2021-08-01/producttag/predicates.go       |   6 +-
 .../2021-08-01/region/predicates.go           |   6 +-
 .../2021-08-01/reports/predicates.go          |  52 ++---
 .../2021-08-01/schema/predicates.go           |   6 +-
 .../2021-08-01/skus/predicates.go             |  12 +-
 .../2021-08-01/subscription/predicates.go     |   6 +-
 .../2021-08-01/tag/predicates.go              |   6 +-
 .../2021-08-01/tenantaccess/predicates.go     |   6 +-
 .../2021-08-01/tenantsettings/predicates.go   |   6 +-
 .../2021-08-01/user/predicates.go             |   6 +-
 .../2021-08-01/usergroup/predicates.go        |   6 +-
 .../2021-08-01/useridentity/predicates.go     |   4 +-
 .../2021-08-01/usersubscription/predicates.go |   6 +-
 .../2022-08-01/api/predicates.go              |   6 +-
 .../2022-08-01/apidiagnostic/predicates.go    |   6 +-
 .../2022-08-01/apiissue/predicates.go         |   6 +-
 .../apiissueattachment/predicates.go          |   6 +-
 .../2022-08-01/apiissuecomment/predicates.go  |   6 +-
 .../apimanagementservice/predicates.go        |   8 +-
 .../apimanagementserviceskus/predicates.go    |   2 +-
 .../2022-08-01/apioperation/predicates.go     |   6 +-
 .../2022-08-01/apioperationtag/predicates.go  |   6 +-
 .../2022-08-01/apiproduct/predicates.go       |   6 +-
 .../2022-08-01/apirelease/predicates.go       |   6 +-
 .../2022-08-01/apirevision/predicates.go      |  16 +-
 .../2022-08-01/apischema/predicates.go        |   6 +-
 .../2022-08-01/apitag/predicates.go           |   6 +-
 .../apitagdescription/predicates.go           |   6 +-
 .../2022-08-01/apiversionset/predicates.go    |   6 +-
 .../2022-08-01/apiwiki/predicates.go          |   6 +-
 .../authorizationaccesspolicy/predicates.go   |   6 +-
 .../authorizationprovider/predicates.go       |   6 +-
 .../2022-08-01/authorizations/predicates.go   |   6 +-
 .../authorizationserver/predicates.go         |   6 +-
 .../2022-08-01/backend/predicates.go          |   6 +-
 .../2022-08-01/cache/predicates.go            |   6 +-
 .../2022-08-01/certificate/predicates.go      |   6 +-
 .../2022-08-01/contenttype/predicates.go      |   6 +-
 .../contenttypecontentitem/predicates.go      |   8 +-
 .../2022-08-01/deletedservice/predicates.go   |   8 +-
 .../2022-08-01/diagnostic/predicates.go       |   6 +-
 .../documentationresource/predicates.go       |   6 +-
 .../2022-08-01/emailtemplate/predicates.go    |   6 +-
 .../2022-08-01/gateway/predicates.go          |   6 +-
 .../2022-08-01/gatewayapi/predicates.go       |   6 +-
 .../gatewaycertificateauthority/predicates.go |   6 +-
 .../predicates.go                             |   6 +-
 .../graphqlapiresolver/predicates.go          |   6 +-
 .../graphqlapiresolverpolicy/predicates.go    |   6 +-
 .../2022-08-01/group/predicates.go            |   6 +-
 .../2022-08-01/groupuser/predicates.go        |   6 +-
 .../2022-08-01/identityprovider/predicates.go |   6 +-
 .../2022-08-01/issue/predicates.go            |   6 +-
 .../2022-08-01/logger/predicates.go           |   6 +-
 .../2022-08-01/namedvalue/predicates.go       |   6 +-
 .../2022-08-01/notification/predicates.go     |   6 +-
 .../openidconnectprovider/predicates.go       |   6 +-
 .../2022-08-01/portalrevision/predicates.go   |   6 +-
 .../2022-08-01/product/predicates.go          |   6 +-
 .../2022-08-01/productapi/predicates.go       |   6 +-
 .../2022-08-01/productgroup/predicates.go     |   6 +-
 .../productsubscription/predicates.go         |   6 +-
 .../2022-08-01/producttag/predicates.go       |   6 +-
 .../2022-08-01/productwiki/predicates.go      |   6 +-
 .../2022-08-01/region/predicates.go           |   6 +-
 .../2022-08-01/reports/predicates.go          |  52 ++---
 .../2022-08-01/schema/predicates.go           |   6 +-
 .../2022-08-01/skus/predicates.go             |  12 +-
 .../2022-08-01/subscription/predicates.go     |   6 +-
 .../2022-08-01/tag/predicates.go              |   6 +-
 .../2022-08-01/tenantaccess/predicates.go     |   6 +-
 .../2022-08-01/tenantsettings/predicates.go   |   6 +-
 .../2022-08-01/user/predicates.go             |   6 +-
 .../2022-08-01/usergroup/predicates.go        |   6 +-
 .../2022-08-01/useridentity/predicates.go     |   4 +-
 .../2022-08-01/usersubscription/predicates.go |   6 +-
 .../configurationstores/predicates.go         |  18 +-
 .../deletedconfigurationstores/predicates.go  |   6 +-
 .../privateendpointconnections/predicates.go  |   6 +-
 .../privatelinkresources/predicates.go        |   6 +-
 .../2023-03-01/replicas/predicates.go         |   8 +-
 .../2022-04-01/workbooksapis/predicates.go    |  10 +-
 .../2022-06-15/webtestsapis/predicates.go     |   6 +-
 .../appplatform/predicates.go                 | 130 +++++------
 .../2022-12-01/appplatform/predicates.go      | 130 +++++------
 .../eligiblechildresources/predicates.go      |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../roleassignmentschedules/predicates.go     |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../roleeligibilityschedules/predicates.go    |   6 +-
 .../rolemanagementpolicies/predicates.go      |   6 +-
 .../predicates.go                             |   6 +-
 .../2022-04-01/denyassignments/predicates.go  |   6 +-
 .../provideroperationsmetadata/predicates.go  |   8 +-
 .../2022-04-01/roleassignments/predicates.go  |   6 +-
 .../2022-04-01/roledefinitions/predicates.go  |   6 +-
 .../2015-10-31/activity/predicates.go         |   4 +-
 .../automationaccount/predicates.go           |  10 +-
 .../2015-10-31/certificate/predicates.go      |   6 +-
 .../2015-10-31/connection/predicates.go       |   6 +-
 .../2015-10-31/connectiontype/predicates.go   |   6 +-
 .../2015-10-31/credential/predicates.go       |   6 +-
 .../dsccompilationjob/predicates.go           |   6 +-
 .../2015-10-31/dscconfiguration/predicates.go |  10 +-
 .../2015-10-31/dscnode/predicates.go          |  20 +-
 .../dscnodeconfiguration/predicates.go        |  10 +-
 .../hybridrunbookworkergroup/predicates.go    |   4 +-
 .../automation/2015-10-31/job/predicates.go   |   2 +-
 .../2015-10-31/jobschedule/predicates.go      |   6 +-
 .../2015-10-31/jobstream/predicates.go        |   2 +-
 .../2015-10-31/module/predicates.go           |  10 +-
 .../2015-10-31/nodereports/predicates.go      |  28 +--
 .../2015-10-31/runbook/predicates.go          |  10 +-
 .../2015-10-31/schedule/predicates.go         |   6 +-
 .../2015-10-31/testjobstream/predicates.go    |   2 +-
 .../2015-10-31/variable/predicates.go         |   6 +-
 .../2015-10-31/watcher/predicates.go          |  10 +-
 .../2015-10-31/webhook/predicates.go          |   6 +-
 .../2019-06-01/activity/predicates.go         |   4 +-
 .../automationaccount/predicates.go           |  10 +-
 .../2019-06-01/certificate/predicates.go      |   6 +-
 .../2019-06-01/connection/predicates.go       |   6 +-
 .../2019-06-01/connectiontype/predicates.go   |   6 +-
 .../2019-06-01/credential/predicates.go       |   6 +-
 .../dsccompilationjob/predicates.go           |   6 +-
 .../2019-06-01/dscconfiguration/predicates.go |  10 +-
 .../2019-06-01/dscnode/predicates.go          |   6 +-
 .../dscnodeconfiguration/predicates.go        |   6 +-
 .../hybridrunbookworkergroup/predicates.go    |   4 +-
 .../automation/2019-06-01/job/predicates.go   |   6 +-
 .../2019-06-01/jobschedule/predicates.go      |   6 +-
 .../2019-06-01/jobstream/predicates.go        |   2 +-
 .../2019-06-01/module/predicates.go           |  10 +-
 .../2019-06-01/nodereports/predicates.go      |  28 +--
 .../2019-06-01/python2package/predicates.go   |  10 +-
 .../2019-06-01/runbook/predicates.go          |  10 +-
 .../2019-06-01/schedule/predicates.go         |   6 +-
 .../2019-06-01/sourcecontrol/predicates.go    |   6 +-
 .../sourcecontrolsyncjob/predicates.go        |   6 +-
 .../sourcecontrolsyncjobstreams/predicates.go |   2 +-
 .../2019-06-01/testjobstream/predicates.go    |   2 +-
 .../2019-06-01/variable/predicates.go         |   6 +-
 .../2019-06-01/watcher/predicates.go          |  10 +-
 .../2020-01-13-preview/activity/predicates.go |   4 +-
 .../automationaccount/predicates.go           |  10 +-
 .../certificate/predicates.go                 |   6 +-
 .../connection/predicates.go                  |   6 +-
 .../connectiontype/predicates.go              |   6 +-
 .../credential/predicates.go                  |   6 +-
 .../dsccompilationjob/predicates.go           |   6 +-
 .../2020-01-13-preview/dscnode/predicates.go  |   6 +-
 .../dscnodeconfiguration/predicates.go        |   6 +-
 .../hybridrunbookworkergroup/predicates.go    |   4 +-
 .../jobschedule/predicates.go                 |   6 +-
 .../2020-01-13-preview/module/predicates.go   |  10 +-
 .../nodereports/predicates.go                 |  28 +--
 .../python2package/predicates.go              |  10 +-
 .../2020-01-13-preview/schedule/predicates.go |   6 +-
 .../sourcecontrol/predicates.go               |   6 +-
 .../sourcecontrolsyncjob/predicates.go        |   6 +-
 .../sourcecontrolsyncjobstreams/predicates.go |   2 +-
 .../2020-01-13-preview/variable/predicates.go |   6 +-
 .../2020-01-13-preview/watcher/predicates.go  |  10 +-
 .../automationaccount/predicates.go           |  10 +-
 .../hybridrunbookworker/predicates.go         |   6 +-
 .../hybridrunbookworkergroup/predicates.go    |   6 +-
 .../2022-08-08/activity/predicates.go         |   4 +-
 .../automationaccount/predicates.go           |  10 +-
 .../2022-08-08/certificate/predicates.go      |   6 +-
 .../2022-08-08/connection/predicates.go       |   6 +-
 .../2022-08-08/connectiontype/predicates.go   |   6 +-
 .../2022-08-08/credential/predicates.go       |   6 +-
 .../2022-08-08/dscconfiguration/predicates.go |  10 +-
 .../dscnodeconfiguration/predicates.go        |   6 +-
 .../hybridrunbookworker/predicates.go         |   6 +-
 .../hybridrunbookworkergroup/predicates.go    |   6 +-
 .../automation/2022-08-08/job/predicates.go   |   6 +-
 .../2022-08-08/jobschedule/predicates.go      |   6 +-
 .../2022-08-08/jobstream/predicates.go        |   2 +-
 .../2022-08-08/module/predicates.go           |  10 +-
 .../2022-08-08/python2package/predicates.go   |  10 +-
 .../2022-08-08/python3package/predicates.go   |  10 +-
 .../2022-08-08/runbook/predicates.go          |  10 +-
 .../2022-08-08/schedule/predicates.go         |   6 +-
 .../2022-08-08/sourcecontrol/predicates.go    |   6 +-
 .../sourcecontrolsyncjob/predicates.go        |   6 +-
 .../sourcecontrolsyncjobstreams/predicates.go |   2 +-
 .../2022-08-08/testjobstream/predicates.go    |   2 +-
 .../2022-08-08/variable/predicates.go         |   6 +-
 .../privateendpointconnections/predicates.go  |   6 +-
 .../privatelinkforazuread/predicates.go       |  16 +-
 .../privatelinkresources/predicates.go        |   6 +-
 .../2023-03-01/arcsettings/predicates.go      |   6 +-
 .../2023-03-01/clusters/predicates.go         |   6 +-
 .../2023-03-01/extensions/predicates.go       |   6 +-
 .../2023-03-01/offers/predicates.go           |   6 +-
 .../2023-03-01/publishers/predicates.go       |   6 +-
 .../2023-03-01/skuses/predicates.go           |   6 +-
 .../2023-03-01/updateruns/predicates.go       |   8 +-
 .../2023-03-01/updates/predicates.go          |   8 +-
 .../2023-03-01/updatesummaries/predicates.go  |   8 +-
 .../2023-05-01/application/predicates.go      |   8 +-
 .../applicationpackage/predicates.go          |   8 +-
 .../2023-05-01/batchaccount/predicates.go     |  10 +-
 .../2023-05-01/batchmanagements/predicates.go |   8 +-
 .../2023-05-01/certificate/predicates.go      |   8 +-
 .../batch/2023-05-01/location/predicates.go   |   4 +-
 .../batch/2023-05-01/pool/predicates.go       |   8 +-
 .../privateendpointconnection/predicates.go   |   8 +-
 .../privatelinkresource/predicates.go         |   8 +-
 .../assignment/predicates.go                  |   6 +-
 .../assignmentoperations/predicates.go        |   6 +-
 .../blueprint/predicates.go                   |   6 +-
 .../publishedblueprint/predicates.go          |   6 +-
 .../capabilities/predicates.go                |   6 +-
 .../capabilitytypes/predicates.go             |   8 +-
 .../experiments/predicates.go                 |  18 +-
 .../2022-07-01-preview/targets/predicates.go  |   8 +-
 .../targettypes/predicates.go                 |   8 +-
 .../cognitiveservicesaccounts/predicates.go   |  32 +--
 .../predicates.go                             |  12 +-
 .../2023-05-01/commitmentplans/predicates.go  |  20 +-
 .../2023-05-01/commitmenttiers/predicates.go  |  10 +-
 .../2023-05-01/deployments/predicates.go      |   8 +-
 .../cognitive/2023-05-01/models/predicates.go |   4 +-
 .../cognitive/2023-05-01/skus/predicates.go   |   8 +-
 .../cognitive/2023-05-01/usages/predicates.go |   8 +-
 .../communicationservices/predicates.go       |   6 +-
 .../2023-03-31/domains/predicates.go          |   6 +-
 .../2023-03-31/emailservices/predicates.go    |   6 +-
 .../2023-03-31/senderusernames/predicates.go  |   6 +-
 .../2021-07-01/availabilitysets/predicates.go |  12 +-
 .../capacityreservation/predicates.go         |   6 +-
 .../capacityreservationgroups/predicates.go   |   6 +-
 .../2021-07-01/dedicatedhost/predicates.go    |   6 +-
 .../dedicatedhostgroups/predicates.go         |   6 +-
 .../2021-07-01/galleries/predicates.go        |   6 +-
 .../galleryapplications/predicates.go         |   6 +-
 .../galleryapplicationversions/predicates.go  |   6 +-
 .../2021-07-01/galleryimages/predicates.go    |   6 +-
 .../galleryimageversions/predicates.go        |   6 +-
 .../compute/2021-07-01/images/predicates.go   |   6 +-
 .../proximityplacementgroups/predicates.go    |   6 +-
 .../restorepointcollections/predicates.go     |   6 +-
 .../2021-07-01/sharedgalleries/predicates.go  |   4 +-
 .../sharedgalleryimages/predicates.go         |   4 +-
 .../sharedgalleryimageversions/predicates.go  |   4 +-
 .../compute/2021-07-01/skus/predicates.go     |  12 +-
 .../2021-07-01/sshpublickeys/predicates.go    |   6 +-
 .../virtualmachineruncommands/predicates.go   |   6 +-
 .../2021-07-01/virtualmachines/predicates.go  |   6 +-
 .../predicates.go                             |   6 +-
 .../virtualmachinescalesets/predicates.go     |  12 +-
 .../predicates.go                             |   6 +-
 .../virtualmachinescalesetvms/predicates.go   |   8 +-
 .../2021-11-01/availabilitysets/predicates.go |   6 +-
 .../capacityreservation/predicates.go         |   6 +-
 .../capacityreservationgroups/predicates.go   |   6 +-
 .../2021-11-01/dedicatedhost/predicates.go    |   6 +-
 .../dedicatedhostgroups/predicates.go         |   6 +-
 .../compute/2021-11-01/images/predicates.go   |   6 +-
 .../proximityplacementgroups/predicates.go    |   6 +-
 .../restorepointcollections/predicates.go     |   6 +-
 .../2021-11-01/sshpublickeys/predicates.go    |   6 +-
 .../virtualmachineruncommands/predicates.go   |   6 +-
 .../2021-11-01/virtualmachines/predicates.go  |   6 +-
 .../predicates.go                             |   6 +-
 .../virtualmachinescalesets/predicates.go     |  12 +-
 .../predicates.go                             |   6 +-
 .../virtualmachinescalesetvms/predicates.go   |   8 +-
 .../2022-03-01/availabilitysets/predicates.go |   6 +-
 .../capacityreservation/predicates.go         |   6 +-
 .../capacityreservationgroups/predicates.go   |   6 +-
 .../2022-03-01/dedicatedhost/predicates.go    |   6 +-
 .../dedicatedhostgroups/predicates.go         |   6 +-
 .../compute/2022-03-01/images/predicates.go   |   6 +-
 .../proximityplacementgroups/predicates.go    |   6 +-
 .../restorepointcollections/predicates.go     |   6 +-
 .../2022-03-01/sshpublickeys/predicates.go    |   6 +-
 .../virtualmachineruncommands/predicates.go   |   6 +-
 .../2022-03-01/virtualmachines/predicates.go  |   6 +-
 .../predicates.go                             |   6 +-
 .../virtualmachinescalesets/predicates.go     |  12 +-
 .../predicates.go                             |   6 +-
 .../virtualmachinescalesetvms/predicates.go   |   8 +-
 .../2022-03-02/diskaccesses/predicates.go     |  12 +-
 .../diskencryptionsets/predicates.go          |   6 +-
 .../compute/2022-03-02/disks/predicates.go    |   8 +-
 .../incrementalrestorepoints/predicates.go    |   6 +-
 .../2022-03-02/snapshots/predicates.go        |   8 +-
 .../communitygalleryimages/predicates.go      |   6 +-
 .../predicates.go                             |   6 +-
 .../2022-03-03/galleries/predicates.go        |   6 +-
 .../galleryapplications/predicates.go         |   6 +-
 .../galleryapplicationversions/predicates.go  |   6 +-
 .../2022-03-03/galleryimages/predicates.go    |   6 +-
 .../galleryimageversions/predicates.go        |   6 +-
 .../2022-03-03/sharedgalleries/predicates.go  |   4 +-
 .../sharedgalleryimages/predicates.go         |   4 +-
 .../sharedgalleryimageversions/predicates.go  |   4 +-
 .../confidentialledger/predicates.go          |   8 +-
 .../2022-01-10-preview/clusters/predicates.go |   8 +-
 .../datastores/predicates.go                  |   8 +-
 .../guestagents/predicates.go                 |   6 +-
 .../2022-01-10-preview/hosts/predicates.go    |   8 +-
 .../hybrididentitymetadata/predicates.go      |   6 +-
 .../inventoryitems/predicates.go              |   8 +-
 .../machineextensions/predicates.go           |   8 +-
 .../resourcepools/predicates.go               |   8 +-
 .../2022-01-10-preview/vcenters/predicates.go |   8 +-
 .../virtualmachines/predicates.go             |   8 +-
 .../virtualmachinetemplates/predicates.go     |   8 +-
 .../virtualnetworks/predicates.go             |   8 +-
 .../2019-10-01/budgets/predicates.go          |   8 +-
 .../2019-10-01/events/predicates.go           |   8 +-
 .../consumption/2019-10-01/lots/predicates.go |   8 +-
 .../2019-10-01/marketplaces/predicates.go     |   8 +-
 .../reservationdetails/predicates.go          |   8 +-
 .../reservationsummaries/predicates.go        |   8 +-
 .../reservationtransactions/predicates.go     |  12 +-
 .../2021-10-01/budgets/predicates.go          |   8 +-
 .../2021-10-01/events/predicates.go           |   8 +-
 .../consumption/2021-10-01/lots/predicates.go |   8 +-
 .../2021-10-01/marketplaces/predicates.go     |   8 +-
 .../reservationdetails/predicates.go          |   8 +-
 .../reservationsummaries/predicates.go        |   8 +-
 .../reservationtransactions/predicates.go     |  12 +-
 .../2022-09-01/budgets/predicates.go          |   8 +-
 .../2022-09-01/events/predicates.go           |   8 +-
 .../consumption/2022-09-01/lots/predicates.go |   8 +-
 .../2022-09-01/marketplaces/predicates.go     |   8 +-
 .../reservationdetails/predicates.go          |   8 +-
 .../reservationsummaries/predicates.go        |   8 +-
 .../reservationtransactions/predicates.go     |  12 +-
 .../2023-05-01/budgets/predicates.go          |   8 +-
 .../2023-05-01/events/predicates.go           |   8 +-
 .../consumption/2023-05-01/lots/predicates.go |   8 +-
 .../2023-05-01/marketplaces/predicates.go     |   8 +-
 .../reservationdetails/predicates.go          |   8 +-
 .../reservationsummaries/predicates.go        |   8 +-
 .../reservationtransactions/predicates.go     |  12 +-
 .../2022-03-01/certificates/predicates.go     |   6 +-
 .../2022-03-01/containerapps/predicates.go    |   6 +-
 .../containerappsauthconfigs/predicates.go    |   6 +-
 .../containerappsrevisions/predicates.go      |   6 +-
 .../containerappssourcecontrols/predicates.go |   6 +-
 .../2022-03-01/daprcomponents/predicates.go   |   6 +-
 .../managedenvironments/predicates.go         |  12 +-
 .../availableworkloadprofiles/predicates.go   |   8 +-
 .../certificates/predicates.go                |   6 +-
 .../connectedenvironments/predicates.go       |  12 +-
 .../containerapps/predicates.go               |  20 +-
 .../containerappsauthconfigs/predicates.go    |   6 +-
 .../containerappsrevisions/predicates.go      |   6 +-
 .../containerappssourcecontrols/predicates.go |   6 +-
 .../daprcomponents/predicates.go              |   6 +-
 .../diagnostics/predicates.go                 |  12 +-
 .../2022-11-01-preview/jobs/predicates.go     |  16 +-
 .../managedcertificates/predicates.go         |   6 +-
 .../managedenvironments/predicates.go         |  26 +--
 .../containerinstance/predicates.go           |  18 +-
 .../agentpools/predicates.go                  |   6 +-
 .../2019-06-01-preview/runs/predicates.go     |   6 +-
 .../2019-06-01-preview/taskruns/predicates.go |   8 +-
 .../2019-06-01-preview/tasks/predicates.go    |   6 +-
 .../connectedregistries/predicates.go         |   6 +-
 .../exportpipelines/predicates.go             |   8 +-
 .../importpipelines/predicates.go             |   8 +-
 .../pipelineruns/predicates.go                |   6 +-
 .../privateendpointconnections/predicates.go  |   6 +-
 .../registries/predicates.go                  |  12 +-
 .../replications/predicates.go                |   6 +-
 .../scopemaps/predicates.go                   |   6 +-
 .../2021-08-01-preview/tokens/predicates.go   |   6 +-
 .../2021-08-01-preview/webhooks/predicates.go |   8 +-
 .../privateendpointconnections/predicates.go  |   6 +-
 .../2022-12-01/registries/predicates.go       |  12 +-
 .../2022-12-01/replications/predicates.go     |   6 +-
 .../2022-12-01/scopemaps/predicates.go        |   6 +-
 .../2022-12-01/tokens/predicates.go           |   6 +-
 .../2022-12-01/webhooks/predicates.go         |   8 +-
 .../2019-08-01/agentpools/predicates.go       |   6 +-
 .../2019-08-01/managedclusters/predicates.go  |   6 +-
 .../agentpools/predicates.go                  |   6 +-
 .../fleetmembers/predicates.go                |   8 +-
 .../2022-09-02-preview/fleets/predicates.go   |   8 +-
 .../maintenanceconfigurations/predicates.go   |   6 +-
 .../managedclusters/predicates.go             |   8 +-
 .../managedclustersnapshots/predicates.go     |   6 +-
 .../snapshots/predicates.go                   |   6 +-
 .../trustedaccess/predicates.go               |  10 +-
 .../agentpools/predicates.go                  |   6 +-
 .../maintenanceconfigurations/predicates.go   |   6 +-
 .../managedclusters/predicates.go             |   8 +-
 .../managedclustersnapshots/predicates.go     |   6 +-
 .../snapshots/predicates.go                   |   6 +-
 .../trustedaccess/predicates.go               |  10 +-
 .../agentpools/predicates.go                  |   6 +-
 .../maintenanceconfigurations/predicates.go   |   6 +-
 .../managedclusters/predicates.go             |   8 +-
 .../managedclustersnapshots/predicates.go     |   6 +-
 .../snapshots/predicates.go                   |   6 +-
 .../trustedaccess/predicates.go               |  10 +-
 .../2021-10-01/views/predicates.go            |   8 +-
 .../scheduledactions/predicates.go            |   8 +-
 .../benefitrecommendations/predicates.go      |   6 +-
 .../2022-10-01/scheduledactions/predicates.go |   8 +-
 .../2022-10-01/views/predicates.go            |   8 +-
 .../benefitrecommendations/predicates.go      |   6 +-
 .../2023-03-01/scheduledactions/predicates.go |   8 +-
 .../2023-03-01/views/predicates.go            |   8 +-
 .../associations/predicates.go                |   6 +-
 .../customresourceprovider/predicates.go      |   6 +-
 .../2022-08-01/grafanaresource/predicates.go  |   8 +-
 .../privateendpointconnection/predicates.go   |   6 +-
 .../privatelinkresource/predicates.go         |   6 +-
 .../2022-03-01/alerts/predicates.go           |   6 +-
 .../2022-03-01/availableskus/predicates.go    |   8 +-
 .../bandwidthschedules/predicates.go          |   6 +-
 .../2022-03-01/containers/predicates.go       |   6 +-
 .../2022-03-01/devices/predicates.go          |   8 +-
 .../2022-03-01/monitoringconfig/predicates.go |   6 +-
 .../2022-03-01/nodes/predicates.go            |   6 +-
 .../2022-03-01/orders/predicates.go           |   8 +-
 .../2022-03-01/shares/predicates.go           |   6 +-
 .../storageaccountcredentials/predicates.go   |   6 +-
 .../2022-03-01/storageaccounts/predicates.go  |   6 +-
 .../2022-03-01/users/predicates.go            |   6 +-
 .../2023-07-01/alerts/predicates.go           |   6 +-
 .../2023-07-01/availableskus/predicates.go    |   8 +-
 .../bandwidthschedules/predicates.go          |   6 +-
 .../2023-07-01/containers/predicates.go       |   6 +-
 .../2023-07-01/devices/predicates.go          |   8 +-
 .../2023-07-01/monitoringconfig/predicates.go |   6 +-
 .../2023-07-01/nodes/predicates.go            |   6 +-
 .../2023-07-01/orders/predicates.go           |   8 +-
 .../2023-07-01/shares/predicates.go           |   6 +-
 .../storageaccountcredentials/predicates.go   |   6 +-
 .../2023-07-01/storageaccounts/predicates.go  |   6 +-
 .../2023-07-01/users/predicates.go            |   6 +-
 .../accessconnector/predicates.go             |   6 +-
 .../privateendpointconnections/predicates.go  |   6 +-
 .../privatelinkresources/predicates.go        |   6 +-
 .../vnetpeering/predicates.go                 |   6 +-
 .../workspaces/predicates.go                  |   6 +-
 .../accessconnector/predicates.go             |   6 +-
 .../privateendpointconnections/predicates.go  |   6 +-
 .../privatelinkresources/predicates.go        |   6 +-
 .../2023-02-01/vnetpeering/predicates.go      |   6 +-
 .../2023-02-01/workspaces/predicates.go       |   6 +-
 .../2023-05-01/accessconnector/predicates.go  |   6 +-
 .../2021-03-01/agreements/predicates.go       |   6 +-
 .../datadog/2021-03-01/apikey/predicates.go   |   6 +-
 .../datadog/2021-03-01/hosts/predicates.go    |   2 +-
 .../2021-03-01/linkedresources/predicates.go  |   2 +-
 .../monitoredresources/predicates.go          |  10 +-
 .../2021-03-01/monitorsresource/predicates.go |   6 +-
 .../datadog/2021-03-01/rules/predicates.go    |   6 +-
 .../2021-03-01/singlesignon/predicates.go     |   6 +-
 .../2022-06-01/agreements/predicates.go       |   6 +-
 .../datadog/2022-06-01/apikey/predicates.go   |   6 +-
 .../datadog/2022-06-01/hosts/predicates.go    |   2 +-
 .../2022-06-01/linkedresources/predicates.go  |   2 +-
 .../monitoredresources/predicates.go          |  10 +-
 .../2022-06-01/monitorsresource/predicates.go |   6 +-
 .../datadog/2022-06-01/rules/predicates.go    |   6 +-
 .../2022-06-01/singlesignon/predicates.go     |   6 +-
 .../changedatacapture/predicates.go           |   8 +-
 .../2018-06-01/credentials/predicates.go      |   8 +-
 .../dataflowdebugsession/predicates.go        |  18 +-
 .../2018-06-01/dataflows/predicates.go        |   8 +-
 .../2018-06-01/datasets/predicates.go         |   8 +-
 .../2018-06-01/factories/predicates.go        |  10 +-
 .../2018-06-01/globalparameters/predicates.go |   8 +-
 .../integrationruntimes/predicates.go         |   8 +-
 .../2018-06-01/linkedservices/predicates.go   |   8 +-
 .../managedprivateendpoints/predicates.go     |   8 +-
 .../managedvirtualnetworks/predicates.go      |   8 +-
 .../2018-06-01/pipelines/predicates.go        |   8 +-
 .../privateendpointconnections/predicates.go  |   8 +-
 .../2018-06-01/triggers/predicates.go         |   8 +-
 .../2016-11-01/accounts/predicates.go         |   8 +-
 .../2016-11-01/computepolicies/predicates.go  |   6 +-
 .../datalakestoreaccounts/predicates.go       |   6 +-
 .../2016-11-01/firewallrules/predicates.go    |   6 +-
 .../2016-11-01/storageaccounts/predicates.go  |  14 +-
 .../2016-11-01/accounts/predicates.go         |   8 +-
 .../2016-11-01/firewallrules/predicates.go    |   6 +-
 .../trustedidproviders/predicates.go          |   6 +-
 .../virtualnetworkrules/predicates.go         |   6 +-
 .../2018-04-19/get/predicates.go              |  46 ++--
 .../2018-04-19/projectresource/predicates.go  |   6 +-
 .../2018-04-19/serviceresource/predicates.go  |  20 +-
 .../standardoperation/predicates.go           |  46 ++--
 .../2021-06-30/fileresource/predicates.go     |   8 +-
 .../2021-06-30/get/predicates.go              |  54 ++---
 .../2021-06-30/projectresource/predicates.go  |   6 +-
 .../2021-06-30/serviceresource/predicates.go  |  20 +-
 .../standardoperation/predicates.go           |  54 ++---
 .../2022-04-01/azurebackupjobs/predicates.go  |   6 +-
 .../2022-04-01/backupinstances/predicates.go  |   6 +-
 .../2022-04-01/backuppolicies/predicates.go   |   6 +-
 .../2022-04-01/backupvaults/predicates.go     |   8 +-
 .../2022-04-01/recoverypoint/predicates.go    |   6 +-
 .../2022-04-01/resourceguards/predicates.go   |  16 +-
 .../2022-05-01/azurebackupjobs/predicates.go  |   6 +-
 .../2022-05-01/backupinstances/predicates.go  |   6 +-
 .../2022-05-01/backuppolicies/predicates.go   |   6 +-
 .../2022-05-01/backupvaults/predicates.go     |   8 +-
 .../2022-05-01/recoverypoint/predicates.go    |   6 +-
 .../2022-05-01/resourceguards/predicates.go   |  16 +-
 .../2022-12-01/azurebackupjobs/predicates.go  |   6 +-
 .../2022-12-01/backupinstances/predicates.go  |   6 +-
 .../2022-12-01/backuppolicies/predicates.go   |   6 +-
 .../2022-12-01/backupvaults/predicates.go     |   8 +-
 .../deletedbackupinstances/predicates.go      |   6 +-
 .../2022-12-01/recoverypoint/predicates.go    |   6 +-
 .../2022-12-01/resourceguards/predicates.go   |  16 +-
 .../2023-01-01/azurebackupjobs/predicates.go  |   6 +-
 .../2023-01-01/backupinstances/predicates.go  |   6 +-
 .../2023-01-01/backuppolicies/predicates.go   |   6 +-
 .../2023-01-01/backupvaults/predicates.go     |   8 +-
 .../deletedbackupinstances/predicates.go      |   6 +-
 .../dppresourceguardproxies/predicates.go     |   6 +-
 .../2023-01-01/recoverypoint/predicates.go    |   6 +-
 .../2023-01-01/resourceguards/predicates.go   |  16 +-
 .../2019-11-01/account/predicates.go          |   8 +-
 .../consumerinvitation/predicates.go          |   6 +-
 .../2019-11-01/invitation/predicates.go       |   6 +-
 .../datashare/2019-11-01/share/predicates.go  |  58 ++---
 .../sharesubscription/predicates.go           |  50 ++--
 .../2021-08-01/account/predicates.go          |   8 +-
 .../consumerinvitation/predicates.go          |   6 +-
 .../2021-08-01/invitation/predicates.go       |   6 +-
 .../datashare/2021-08-01/share/predicates.go  |  58 ++---
 .../sharesubscription/predicates.go           |  50 ++--
 .../application/predicates.go                 |   6 +-
 .../applicationgroup/predicates.go            |  14 +-
 .../2021-09-03-preview/desktop/predicates.go  |   6 +-
 .../2021-09-03-preview/hostpool/predicates.go |  14 +-
 .../msiximage/predicates.go                   |   6 +-
 .../msixpackage/predicates.go                 |   6 +-
 .../privatelink/predicates.go                 |  12 +-
 .../scalingplan/predicates.go                 |  14 +-
 .../sessionhost/predicates.go                 |   6 +-
 .../startmenuitem/predicates.go               |   6 +-
 .../usersession/predicates.go                 |   6 +-
 .../workspace/predicates.go                   |  14 +-
 .../application/predicates.go                 |   6 +-
 .../applicationgroup/predicates.go            |  14 +-
 .../2022-02-10-preview/desktop/predicates.go  |   6 +-
 .../2022-02-10-preview/hostpool/predicates.go |  14 +-
 .../msiximage/predicates.go                   |   6 +-
 .../msixpackage/predicates.go                 |   6 +-
 .../privatelink/predicates.go                 |  12 +-
 .../scalingplan/predicates.go                 |  14 +-
 .../sessionhost/predicates.go                 |   6 +-
 .../startmenuitem/predicates.go               |   6 +-
 .../usersession/predicates.go                 |   6 +-
 .../workspace/predicates.go                   |  14 +-
 .../2022-09-09/application/predicates.go      |   6 +-
 .../2022-09-09/applicationgroup/predicates.go |  14 +-
 .../2022-09-09/desktop/predicates.go          |   6 +-
 .../2022-09-09/hostpool/predicates.go         |  14 +-
 .../2022-09-09/msiximage/predicates.go        |   6 +-
 .../2022-09-09/msixpackage/predicates.go      |   6 +-
 .../2022-09-09/scalingplan/predicates.go      |  14 +-
 .../scalingplanpooledschedule/predicates.go   |   6 +-
 .../2022-09-09/sessionhost/predicates.go      |   6 +-
 .../2022-09-09/startmenuitem/predicates.go    |   6 +-
 .../2022-09-09/usersession/predicates.go      |   6 +-
 .../2022-09-09/workspace/predicates.go        |  14 +-
 .../2022-02-05/iotdpsresource/predicates.go   |  12 +-
 .../2022-12-12/iotdpsresource/predicates.go   |  16 +-
 .../2022-10-01/deviceupdates/predicates.go    |  12 +-
 .../2023-07-01/deviceupdates/predicates.go    |  12 +-
 .../2018-09-15/armtemplates/predicates.go     |   8 +-
 .../2018-09-15/artifacts/predicates.go        |   8 +-
 .../2018-09-15/artifactsources/predicates.go  |   8 +-
 .../2018-09-15/customimages/predicates.go     |   8 +-
 .../devtestlab/2018-09-15/disks/predicates.go |   8 +-
 .../2018-09-15/environments/predicates.go     |   8 +-
 .../2018-09-15/formulas/predicates.go         |   8 +-
 .../2018-09-15/galleryimages/predicates.go    |   8 +-
 .../2018-09-15/globalschedules/predicates.go  |   8 +-
 .../devtestlab/2018-09-15/labs/predicates.go  |  10 +-
 .../notificationchannels/predicates.go        |   8 +-
 .../2018-09-15/policies/predicates.go         |   8 +-
 .../2018-09-15/schedules/predicates.go        |   8 +-
 .../2018-09-15/secrets/predicates.go          |   8 +-
 .../2018-09-15/servicefabrics/predicates.go   |   8 +-
 .../servicefabricschedules/predicates.go      |   8 +-
 .../devtestlab/2018-09-15/users/predicates.go |   8 +-
 .../2018-09-15/virtualmachines/predicates.go  |   8 +-
 .../virtualmachineschedules/predicates.go     |   8 +-
 .../2018-09-15/virtualnetworks/predicates.go  |   8 +-
 .../digitaltwinsinstance/predicates.go        |   6 +-
 .../2020-12-01/endpoints/predicates.go        |   6 +-
 .../digitaltwinsinstance/predicates.go        |   6 +-
 .../2022-10-31/endpoints/predicates.go        |   6 +-
 .../predicates.go                             |   6 +-
 .../digitaltwinsinstance/predicates.go        |   6 +-
 .../2023-01-31/endpoints/predicates.go        |   6 +-
 .../predicates.go                             |   6 +-
 .../dns/2018-05-01/recordsets/predicates.go   |   8 +-
 .../dns/2018-05-01/zones/predicates.go        |   8 +-
 .../dnsforwardingrulesets/predicates.go       |  10 +-
 .../2022-07-01/dnsresolvers/predicates.go     |   8 +-
 .../2022-07-01/forwardingrules/predicates.go  |   8 +-
 .../2022-07-01/inboundendpoints/predicates.go |   8 +-
 .../outboundendpoints/predicates.go           |   8 +-
 .../virtualnetworklinks/predicates.go         |   8 +-
 .../2021-09-01/monitors/predicates.go         |  32 +--
 .../2021-09-01/singlesignon/predicates.go     |   6 +-
 .../2021-09-01/tagrules/predicates.go         |   6 +-
 .../2023-04-27/monitors/predicates.go         |  32 +--
 .../2023-04-27/singlesignon/predicates.go     |   6 +-
 .../2023-04-27/tagrules/predicates.go         |   6 +-
 .../monitoredresources/predicates.go          |   4 +-
 .../2023-06-01/monitorsresource/predicates.go |   6 +-
 .../elastic/2023-06-01/rules/predicates.go    |   6 +-
 .../2023-06-01/vmhhostlist/predicates.go      |   2 +-
 .../elasticsan/predicates.go                  |   8 +-
 .../elasticsans/predicates.go                 |   8 +-
 .../volumegroups/predicates.go                |   6 +-
 .../2021-11-20-preview/volumes/predicates.go  |   6 +-
 .../2022-06-15/channels/predicates.go         |   6 +-
 .../2022-06-15/domains/predicates.go          |   6 +-
 .../2022-06-15/domaintopics/predicates.go     |   6 +-
 .../eventsubscriptions/predicates.go          |   6 +-
 .../partnerconfigurations/predicates.go       |   8 +-
 .../partnernamespaces/predicates.go           |   6 +-
 .../partnerregistrations/predicates.go        |   6 +-
 .../2022-06-15/partnertopics/predicates.go    |   6 +-
 .../privateendpointconnections/predicates.go  |   6 +-
 .../privatelinkresources/predicates.go        |   6 +-
 .../2022-06-15/systemtopics/predicates.go     |   6 +-
 .../eventgrid/2022-06-15/topics/predicates.go |   6 +-
 .../2022-06-15/verifiedpartners/predicates.go |   6 +-
 .../predicates.go                             |   8 +-
 .../authorizationruleseventhubs/predicates.go |   8 +-
 .../predicates.go                             |   8 +-
 .../2021-11-01/consumergroups/predicates.go   |   8 +-
 .../disasterrecoveryconfigs/predicates.go     |   8 +-
 .../2021-11-01/eventhubs/predicates.go        |   8 +-
 .../eventhubsclusters/predicates.go           |   8 +-
 .../2021-11-01/namespaces/predicates.go       |   8 +-
 .../predicates.go                             |   8 +-
 .../2021-11-01/schemaregistry/predicates.go   |   8 +-
 .../applicationgroup/predicates.go            |   8 +-
 .../predicates.go                             |   8 +-
 .../authorizationruleseventhubs/predicates.go |   8 +-
 .../predicates.go                             |   8 +-
 .../consumergroups/predicates.go              |   8 +-
 .../disasterrecoveryconfigs/predicates.go     |   8 +-
 .../eventhubs/predicates.go                   |   8 +-
 .../eventhubsclusters/predicates.go           |   8 +-
 .../namespaces/predicates.go                  |   8 +-
 .../predicates.go                             |   8 +-
 .../schemaregistry/predicates.go              |   8 +-
 .../2021-08-15/customlocations/predicates.go  |  12 +-
 .../fluidrelaycontainers/predicates.go        |   6 +-
 .../fluidrelayservers/predicates.go           |   6 +-
 .../fluidrelaycontainers/predicates.go        |   6 +-
 .../fluidrelayservers/predicates.go           |   6 +-
 .../2020-04-01/frontdoors/predicates.go       |  20 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |  10 +-
 .../2020-05-01/frontdoors/predicates.go       |  20 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |  10 +-
 .../graphservicesprods/predicates.go          |   8 +-
 .../2021-11-30/dedicatedhsms/predicates.go    |   8 +-
 .../applications/predicates.go                |   8 +-
 .../2018-06-01-preview/clusters/predicates.go |  10 +-
 .../scriptactions/predicates.go               |   4 +-
 .../scriptexecutionhistory/predicates.go      |   4 +-
 .../2021-06-01/applications/predicates.go     |   8 +-
 .../2021-06-01/clusters/predicates.go         |   8 +-
 .../privateendpointconnections/predicates.go  |   6 +-
 .../2021-06-01/scriptactions/predicates.go    |  16 +-
 .../scriptexecutionhistory/predicates.go      |  16 +-
 .../2022-08-08/healthbots/predicates.go       |   6 +-
 .../2023-05-01/healthbots/predicates.go       |   6 +-
 .../2022-12-01/collection/predicates.go       |   8 +-
 .../2022-12-01/dicomservices/predicates.go    |  10 +-
 .../2022-12-01/fhirservices/predicates.go     |  10 +-
 .../2022-12-01/iotconnectors/predicates.go    |  20 +-
 .../2022-12-01/workspaces/predicates.go       |  10 +-
 .../2023-02-28/collection/predicates.go       |   8 +-
 .../2023-02-28/dicomservices/predicates.go    |  10 +-
 .../2023-02-28/fhirservices/predicates.go     |  10 +-
 .../2023-02-28/iotconnectors/predicates.go    |  20 +-
 .../2023-02-28/workspaces/predicates.go       |  10 +-
 .../machineextensions/predicates.go           |   6 +-
 .../2022-11-10/machines/predicates.go         |   6 +-
 .../privateendpointconnections/predicates.go  |   6 +-
 .../privatelinkresources/predicates.go        |   6 +-
 .../privatelinkscopes/predicates.go           |   6 +-
 .../machineextensions/predicates.go           |   6 +-
 .../2022-12-27/machines/predicates.go         |   6 +-
 .../privateendpointconnections/predicates.go  |   6 +-
 .../privatelinkresources/predicates.go        |   6 +-
 .../privatelinkscopes/predicates.go           |   6 +-
 .../connectedclusters/predicates.go           |   6 +-
 .../2015-04-01/activitylogs/predicates.go     |  24 +-
 .../autoscalesettings/predicates.go           |   6 +-
 .../tenantactivitylogs/predicates.go          |  24 +-
 .../privateendpointconnections/predicates.go  |   6 +-
 .../privatelinkresources/predicates.go        |   6 +-
 .../privatelinkscopedresources/predicates.go  |   6 +-
 .../privatelinkscopesapis/predicates.go       |   6 +-
 .../activitylogalertsapis/predicates.go       |   8 +-
 .../datacollectionendpoints/predicates.go     |   8 +-
 .../predicates.go                             |   8 +-
 .../datacollectionrules/predicates.go         |   8 +-
 .../autoscalesettings/predicates.go           |   6 +-
 .../scheduledqueryrules/predicates.go         |   8 +-
 .../datacollectionendpoints/predicates.go     |   8 +-
 .../predicates.go                             |   8 +-
 .../datacollectionrules/predicates.go         |   8 +-
 .../autoscalesettings/predicates.go           |   6 +-
 .../azuremonitorworkspaces/predicates.go      |   8 +-
 .../2021-11-01-preview/apps/predicates.go     |  20 +-
 .../keyvault/2021-10-01/keys/predicates.go    |   8 +-
 .../2021-10-01/managedhsms/predicates.go      |  14 +-
 .../predicates.go                             |  10 +-
 .../privateendpointconnections/predicates.go  |  10 +-
 .../keyvault/2021-10-01/secrets/predicates.go |   8 +-
 .../keyvault/2021-10-01/vaults/predicates.go  |  22 +-
 .../keyvault/2022-11-01/keys/predicates.go    |   8 +-
 .../2022-11-01/managedhsmkeys/predicates.go   |   6 +-
 .../2022-11-01/managedhsms/predicates.go      |  14 +-
 .../predicates.go                             |  10 +-
 .../privateendpointconnections/predicates.go  |  10 +-
 .../keyvault/2022-11-01/secrets/predicates.go |   8 +-
 .../keyvault/2022-11-01/vaults/predicates.go  |  22 +-
 .../keyvault/2023-02-01/keys/predicates.go    |   8 +-
 .../2023-02-01/managedhsmkeys/predicates.go   |   6 +-
 .../2023-02-01/managedhsms/predicates.go      |  14 +-
 .../predicates.go                             |  10 +-
 .../2023-02-01/mhsmlistregions/predicates.go  |   4 +-
 .../privateendpointconnections/predicates.go  |  10 +-
 .../keyvault/2023-02-01/secrets/predicates.go |   8 +-
 .../keyvault/2023-02-01/vaults/predicates.go  |  22 +-
 .../clusterextensions/predicates.go           |   6 +-
 .../2022-03-01/extensions/predicates.go       |   6 +-
 .../2022-03-01/flux/predicates.go             |   6 +-
 .../fluxconfiguration/predicates.go           |   6 +-
 .../operationsinacluster/predicates.go        |   4 +-
 .../sourcecontrolconfiguration/predicates.go  |   6 +-
 .../clusterextensions/predicates.go           |   6 +-
 .../2022-11-01/extensions/predicates.go       |   6 +-
 .../2022-11-01/flux/predicates.go             |   6 +-
 .../fluxconfiguration/predicates.go           |   6 +-
 .../operationsinacluster/predicates.go        |   4 +-
 .../sourcecontrolconfiguration/predicates.go  |   6 +-
 .../clusterextensions/predicates.go           |   6 +-
 .../2023-05-01/extensions/predicates.go       |   6 +-
 .../2023-05-01/flux/predicates.go             |   6 +-
 .../fluxconfiguration/predicates.go           |   6 +-
 .../operationsinacluster/predicates.go        |   4 +-
 .../sourcecontrolconfiguration/predicates.go  |   6 +-
 .../predicates.go                             |   8 +-
 .../2021-10-01-preview/image/predicates.go    |   6 +-
 .../2021-10-01-preview/lab/predicates.go      |   6 +-
 .../2021-10-01-preview/labplan/predicates.go  |   6 +-
 .../2021-10-01-preview/schedule/predicates.go |   6 +-
 .../2021-10-01-preview/user/predicates.go     |   6 +-
 .../virtualmachine/predicates.go              |   6 +-
 .../2022-08-01/image/predicates.go            |   6 +-
 .../labservices/2022-08-01/lab/predicates.go  |   6 +-
 .../2022-08-01/labplan/predicates.go          |   6 +-
 .../2022-08-01/schedule/predicates.go         |   6 +-
 .../labservices/2022-08-01/skus/predicates.go |   8 +-
 .../2022-08-01/usages/predicates.go           |   6 +-
 .../labservices/2022-08-01/user/predicates.go |   6 +-
 .../2022-08-01/virtualmachine/predicates.go   |   6 +-
 .../2022-12-01/loadtest/predicates.go         |   2 +-
 .../2022-12-01/loadtests/predicates.go        |   6 +-
 .../2022-12-01/quotas/predicates.go           |   6 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../integrationaccountmaps/predicates.go      |   8 +-
 .../integrationaccountpartners/predicates.go  |   8 +-
 .../integrationaccounts/predicates.go         |   8 +-
 .../integrationaccountschemas/predicates.go   |   8 +-
 .../integrationaccountsessions/predicates.go  |   8 +-
 .../predicates.go                             |  16 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   2 +-
 .../workflowrunactions/predicates.go          |  14 +-
 .../2019-05-01/workflowruns/predicates.go     |   6 +-
 .../logic/2019-05-01/workflows/predicates.go  |   8 +-
 .../workflowtriggerhistories/predicates.go    |   6 +-
 .../2019-05-01/workflowtriggers/predicates.go |   6 +-
 .../2019-05-01/workflowversions/predicates.go |   8 +-
 .../logz/2020-10-01/monitors/predicates.go    |  16 +-
 .../2020-10-01/singlesignon/predicates.go     |   6 +-
 .../logz/2020-10-01/subaccount/predicates.go  |  16 +-
 .../logz/2020-10-01/tagrules/predicates.go    |   6 +-
 .../logz/2020-10-01/vmhost/predicates.go      |   4 +-
 .../2022-05-01/batchdeployment/predicates.go  |   8 +-
 .../2022-05-01/batchendpoint/predicates.go    |   8 +-
 .../2022-05-01/codecontainer/predicates.go    |   6 +-
 .../2022-05-01/codeversion/predicates.go      |   6 +-
 .../componentcontainer/predicates.go          |   6 +-
 .../2022-05-01/componentversion/predicates.go |   6 +-
 .../2022-05-01/datacontainer/predicates.go    |   6 +-
 .../2022-05-01/datastore/predicates.go        |   6 +-
 .../2022-05-01/dataversion/predicates.go      |   6 +-
 .../environmentcontainer/predicates.go        |   6 +-
 .../environmentversion/predicates.go          |   6 +-
 .../2022-05-01/job/predicates.go              |   6 +-
 .../machinelearningcomputes/predicates.go     |  10 +-
 .../2022-05-01/modelcontainer/predicates.go   |   6 +-
 .../2022-05-01/modelversion/predicates.go     |   6 +-
 .../2022-05-01/onlinedeployment/predicates.go |  10 +-
 .../2022-05-01/onlineendpoint/predicates.go   |   8 +-
 .../operationalizationclusters/predicates.go  |   8 +-
 .../2022-05-01/quota/predicates.go            |   8 +-
 .../predicates.go                             |   6 +-
 .../2022-05-01/workspaces/predicates.go       |  14 +-
 .../2022-10-01/batchdeployment/predicates.go  |   8 +-
 .../2022-10-01/batchendpoint/predicates.go    |   8 +-
 .../2022-10-01/codecontainer/predicates.go    |   6 +-
 .../2022-10-01/codeversion/predicates.go      |   6 +-
 .../componentcontainer/predicates.go          |   6 +-
 .../2022-10-01/componentversion/predicates.go |   6 +-
 .../2022-10-01/datacontainer/predicates.go    |   6 +-
 .../2022-10-01/datastore/predicates.go        |   6 +-
 .../2022-10-01/dataversion/predicates.go      |   6 +-
 .../environmentcontainer/predicates.go        |   6 +-
 .../environmentversion/predicates.go          |   6 +-
 .../2022-10-01/job/predicates.go              |   6 +-
 .../machinelearningcomputes/predicates.go     |  10 +-
 .../2022-10-01/modelcontainer/predicates.go   |   6 +-
 .../2022-10-01/modelversion/predicates.go     |   6 +-
 .../2022-10-01/onlinedeployment/predicates.go |  10 +-
 .../2022-10-01/onlineendpoint/predicates.go   |   8 +-
 .../operationalizationclusters/predicates.go  |   8 +-
 .../2022-10-01/quota/predicates.go            |   8 +-
 .../2022-10-01/schedule/predicates.go         |   6 +-
 .../predicates.go                             |   6 +-
 .../2022-10-01/workspaces/predicates.go       |  14 +-
 .../2023-04-01/batchdeployment/predicates.go  |   8 +-
 .../2023-04-01/batchendpoint/predicates.go    |   8 +-
 .../2023-04-01/codecontainer/predicates.go    |   6 +-
 .../2023-04-01/codeversion/predicates.go      |   6 +-
 .../componentcontainer/predicates.go          |   6 +-
 .../2023-04-01/componentversion/predicates.go |   6 +-
 .../2023-04-01/datacontainer/predicates.go    |   6 +-
 .../datacontainerregistry/predicates.go       |   6 +-
 .../2023-04-01/datastore/predicates.go        |   6 +-
 .../2023-04-01/dataversion/predicates.go      |   6 +-
 .../dataversionregistry/predicates.go         |   6 +-
 .../environmentcontainer/predicates.go        |   6 +-
 .../environmentversion/predicates.go          |   6 +-
 .../2023-04-01/job/predicates.go              |   6 +-
 .../machinelearningcomputes/predicates.go     |  10 +-
 .../2023-04-01/modelcontainer/predicates.go   |   6 +-
 .../2023-04-01/modelversion/predicates.go     |   6 +-
 .../2023-04-01/onlinedeployment/predicates.go |  10 +-
 .../2023-04-01/onlineendpoint/predicates.go   |   8 +-
 .../operationalizationclusters/predicates.go  |   8 +-
 .../2023-04-01/quota/predicates.go            |   8 +-
 .../registrymanagement/predicates.go          |   8 +-
 .../2023-04-01/schedule/predicates.go         |   6 +-
 .../predicates.go                             |   6 +-
 .../2023-04-01/workspaces/predicates.go       |  14 +-
 .../applicationdefinitions/predicates.go      |  10 +-
 .../2019-07-01/applications/predicates.go     |  10 +-
 .../applicationdefinitions/predicates.go      |  10 +-
 .../2021-07-01/applications/predicates.go     |  10 +-
 .../managedidentities/predicates.go           |  12 +-
 .../registrationassignments/predicates.go     |   6 +-
 .../registrationdefinitions/predicates.go     |   6 +-
 .../predicates.go                             |   6 +-
 .../registrationassignments/predicates.go     |   6 +-
 .../registrationdefinitions/predicates.go     |   6 +-
 .../2020-05-01/entities/predicates.go         |   6 +-
 .../2020-05-01/managementgroups/predicates.go |  18 +-
 .../2021-04-01/entities/predicates.go         |   6 +-
 .../2021-04-01/managementgroups/predicates.go |  18 +-
 .../maps/2021-02-01/accounts/predicates.go    |   6 +-
 .../maps/2021-02-01/creators/predicates.go    |   6 +-
 .../maps/2021-02-01/operations/predicates.go  |   6 +-
 .../serversecurityalertpolicies/predicates.go |   6 +-
 .../virtualnetworkrules/predicates.go         |   6 +-
 .../mariadb/2018-06-01/advisors/predicates.go |   8 +-
 .../predicates.go                             |   6 +-
 .../privateendpointconnections/predicates.go  |   6 +-
 .../privatelinkresources/predicates.go        |   6 +-
 .../2018-06-01/querytexts/predicates.go       |   6 +-
 .../recommendedactions/predicates.go          |   6 +-
 .../serversecurityalertpolicies/predicates.go |   6 +-
 .../topquerystatistics/predicates.go          |   6 +-
 .../virtualnetworkrules/predicates.go         |   6 +-
 .../2018-06-01/waitstatistics/predicates.go   |   6 +-
 .../2021-11-01/accountfilters/predicates.go   |   6 +-
 .../media/2021-11-01/accounts/predicates.go   |   6 +-
 .../assetsandassetfilters/predicates.go       |  12 +-
 .../contentkeypolicies/predicates.go          |   6 +-
 .../media/2021-11-01/encodings/predicates.go  |  12 +-
 .../media/2021-11-01/liveevents/predicates.go |   6 +-
 .../2021-11-01/liveoutputs/predicates.go      |   6 +-
 .../streamingendpoints/predicates.go          |   6 +-
 .../predicates.go                             |  12 +-
 .../media/2022-07-01/encodings/predicates.go  |  12 +-
 .../2022-08-01/accountfilters/predicates.go   |   6 +-
 .../assetsandassetfilters/predicates.go       |  12 +-
 .../contentkeypolicies/predicates.go          |   6 +-
 .../media/2022-08-01/liveevents/predicates.go |   6 +-
 .../2022-08-01/liveoutputs/predicates.go      |   6 +-
 .../streamingendpoints/predicates.go          |   6 +-
 .../predicates.go                             |  12 +-
 .../2020-01-01/hypervcluster/predicates.go    |   6 +-
 .../2020-01-01/hypervhost/predicates.go       |   6 +-
 .../2020-01-01/hypervjobs/predicates.go       |   6 +-
 .../2020-01-01/hypervmachines/predicates.go   |   6 +-
 .../hypervrunasaccounts/predicates.go         |   6 +-
 .../2020-01-01/hypervsites/predicates.go      |  20 +-
 .../migrate/2020-01-01/jobs/predicates.go     |   6 +-
 .../migrate/2020-01-01/machines/predicates.go |   6 +-
 .../2020-01-01/runasaccounts/predicates.go    |   6 +-
 .../migrate/2020-01-01/sites/predicates.go    |  20 +-
 .../migrate/2020-01-01/vcenter/predicates.go  |   6 +-
 .../2020-07-07/hypervcluster/predicates.go    |   6 +-
 .../2020-07-07/hypervhost/predicates.go       |   6 +-
 .../2020-07-07/hypervjobs/predicates.go       |   6 +-
 .../2020-07-07/hypervmachines/predicates.go   |   6 +-
 .../hypervrunasaccounts/predicates.go         |   6 +-
 .../2020-07-07/hypervsites/predicates.go      |  20 +-
 .../migrate/2020-07-07/jobs/predicates.go     |   6 +-
 .../migrate/2020-07-07/machines/predicates.go |   6 +-
 .../2020-07-07/mastersites/predicates.go      |  10 +-
 .../migrate/2020-07-07/migrates/predicates.go |  20 +-
 .../2020-07-07/runasaccounts/predicates.go    |   6 +-
 .../migrate/2020-07-07/sites/predicates.go    |  20 +-
 .../migrate/2020-07-07/vcenter/predicates.go  |   6 +-
 .../2021-01-01/proxy/predicates.go            |  12 +-
 .../2021-01-01/resource/predicates.go         |  12 +-
 .../attacheddatanetworks/predicates.go        |   6 +-
 .../2022-11-01/datanetworks/predicates.go     |   6 +-
 .../2022-11-01/mobilenetworks/predicates.go   |   6 +-
 .../packetcorecontrolplanes/predicates.go     |   6 +-
 .../predicates.go                             |   6 +-
 .../packetcoredataplanes/predicates.go        |   6 +-
 .../2022-11-01/services/predicates.go         |   6 +-
 .../2022-11-01/simgroups/predicates.go        |   6 +-
 .../2022-11-01/simpolicies/predicates.go      |   6 +-
 .../2022-11-01/sims/predicates.go             |   6 +-
 .../2022-11-01/sites/predicates.go            |   6 +-
 .../2022-11-01/slices/predicates.go           |   6 +-
 .../attacheddatanetworks/predicates.go        |   6 +-
 .../2023-06-01/datanetworks/predicates.go     |   6 +-
 .../diagnosticspackages/predicates.go         |   6 +-
 .../2023-06-01/mobilenetworks/predicates.go   |   6 +-
 .../2023-06-01/packetcaptures/predicates.go   |   6 +-
 .../packetcorecontrolplanes/predicates.go     |   6 +-
 .../predicates.go                             |   6 +-
 .../packetcoredataplanes/predicates.go        |   6 +-
 .../2023-06-01/services/predicates.go         |   6 +-
 .../2023-06-01/simgroups/predicates.go        |   6 +-
 .../2023-06-01/simpolicies/predicates.go      |   6 +-
 .../2023-06-01/sims/predicates.go             |   6 +-
 .../2023-06-01/sites/predicates.go            |   6 +-
 .../2023-06-01/slices/predicates.go           |   6 +-
 .../mysql/2021-05-01/backups/predicates.go    |   6 +-
 .../2021-05-01/configurations/predicates.go   |   6 +-
 .../mysql/2021-05-01/databases/predicates.go  |   6 +-
 .../2021-05-01/firewallrules/predicates.go    |   6 +-
 .../mysql/2021-05-01/servers/predicates.go    |   6 +-
 .../azureadadministrators/predicates.go       |   6 +-
 .../2021-12-01-preview/backups/predicates.go  |   6 +-
 .../configurations/predicates.go              |   6 +-
 .../databases/predicates.go                   |   6 +-
 .../firewallrules/predicates.go               |   6 +-
 .../2021-12-01-preview/logfiles/predicates.go |   6 +-
 .../2021-12-01-preview/servers/predicates.go  |   6 +-
 .../azureadadministrators/predicates.go       |   6 +-
 .../mysql/2022-01-01/backups/predicates.go    |   6 +-
 .../2022-01-01/configurations/predicates.go   |   6 +-
 .../mysql/2022-01-01/databases/predicates.go  |   6 +-
 .../2022-01-01/firewallrules/predicates.go    |   6 +-
 .../mysql/2022-01-01/logfiles/predicates.go   |   6 +-
 .../mysql/2022-01-01/servers/predicates.go    |   6 +-
 .../2021-10-01/capacitypools/predicates.go    |   8 +-
 .../2021-10-01/netappaccounts/predicates.go   |   8 +-
 .../2021-10-01/subvolumes/predicates.go       |   6 +-
 .../netapp/2021-10-01/volumes/predicates.go   |   8 +-
 .../2022-01-01/capacitypools/predicates.go    |   8 +-
 .../2022-01-01/netappaccounts/predicates.go   |   8 +-
 .../2022-01-01/subvolumes/predicates.go       |   6 +-
 .../netapp/2022-01-01/volumes/predicates.go   |   8 +-
 .../2022-05-01/capacitypools/predicates.go    |   8 +-
 .../2022-05-01/netappaccounts/predicates.go   |   8 +-
 .../2022-05-01/subvolumes/predicates.go       |   6 +-
 .../netapp/2022-05-01/volumes/predicates.go   |   8 +-
 .../2022-09-01/capacitypools/predicates.go    |   8 +-
 .../2022-09-01/netappaccounts/predicates.go   |   8 +-
 .../2022-09-01/subvolumes/predicates.go       |   6 +-
 .../netapp/2022-09-01/volumes/predicates.go   |   8 +-
 .../2022-11-01/capacitypools/predicates.go    |   8 +-
 .../2022-11-01/netappaccounts/predicates.go   |   8 +-
 .../2022-11-01/subvolumes/predicates.go       |   6 +-
 .../netapp/2022-11-01/volumes/predicates.go   |   8 +-
 .../adminrulecollections/predicates.go        |   8 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../applicationgateways/predicates.go         |  14 +-
 .../predicates.go                             |   6 +-
 .../applicationsecuritygroups/predicates.go   |  10 +-
 .../availabledelegations/predicates.go        |   8 +-
 .../availableservicealiases/predicates.go     |   8 +-
 .../2022-09-01/azurefirewalls/predicates.go   |  10 +-
 .../2022-09-01/bastionhosts/predicates.go     |  42 ++--
 .../bastionshareablelink/predicates.go        |   6 +-
 .../bgpservicecommunities/predicates.go       |   8 +-
 .../predicates.go                             |  10 +-
 .../connectivityconfigurations/predicates.go  |   8 +-
 .../2022-09-01/customipprefixes/predicates.go |  10 +-
 .../ddosprotectionplans/predicates.go         |  10 +-
 .../dscpconfigurations/predicates.go          |  10 +-
 .../2022-09-01/endpointservices/predicates.go |   6 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../expressroutecircuitpeerings/predicates.go |   8 +-
 .../expressroutecircuits/predicates.go        |  10 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |  10 +-
 .../expressroutelinks/predicates.go           |   6 +-
 .../predicates.go                             |   8 +-
 .../expressrouteports/predicates.go           |  10 +-
 .../expressrouteportslocations/predicates.go  |   8 +-
 .../predicates.go                             |   8 +-
 .../2022-09-01/firewallpolicies/predicates.go |  10 +-
 .../predicates.go                             |   8 +-
 .../network/2022-09-01/flowlogs/predicates.go |  10 +-
 .../2022-09-01/ipallocations/predicates.go    |  10 +-
 .../network/2022-09-01/ipgroups/predicates.go |  10 +-
 .../2022-09-01/loadbalancers/predicates.go    |  68 +++---
 .../localnetworkgateways/predicates.go        |  10 +-
 .../2022-09-01/natgateways/predicates.go      |  10 +-
 .../2022-09-01/networkgroups/predicates.go    |   8 +-
 .../networkinterfaces/predicates.go           |  36 +--
 .../networkmanagerconnections/predicates.go   |   8 +-
 .../2022-09-01/networkmanagers/predicates.go  |  10 +-
 .../2022-09-01/networkprofiles/predicates.go  |  10 +-
 .../networksecuritygroups/predicates.go       |  10 +-
 .../networkvirtualappliances/predicates.go    |  10 +-
 .../predicates.go                             |   8 +-
 .../privatednszonegroups/predicates.go        |   6 +-
 .../2022-09-01/privateendpoints/predicates.go |  20 +-
 .../privatelinkservices/predicates.go         |  20 +-
 .../publicipaddresses/predicates.go           |  10 +-
 .../2022-09-01/publicipprefixes/predicates.go |  10 +-
 .../2022-09-01/routefilterrules/predicates.go |   8 +-
 .../2022-09-01/routefilters/predicates.go     |   8 +-
 .../network/2022-09-01/routes/predicates.go   |   8 +-
 .../2022-09-01/routetables/predicates.go      |  10 +-
 .../2022-09-01/scopeconnections/predicates.go |   8 +-
 .../securityadminconfigurations/predicates.go |   8 +-
 .../securitypartnerproviders/predicates.go    |  10 +-
 .../2022-09-01/securityrules/predicates.go    |   8 +-
 .../serviceendpointpolicies/predicates.go     |  12 +-
 .../predicates.go                             |   8 +-
 .../2022-09-01/servicetags/predicates.go      |   6 +-
 .../2022-09-01/staticmembers/predicates.go    |   8 +-
 .../network/2022-09-01/subnets/predicates.go  |   8 +-
 .../network/2022-09-01/usages/predicates.go   |   2 +-
 .../virtualappliancesites/predicates.go       |   8 +-
 .../virtualapplianceskus/predicates.go        |  10 +-
 .../predicates.go                             |  10 +-
 .../virtualnetworkgateways/predicates.go      |  28 +--
 .../virtualnetworkpeerings/predicates.go      |   8 +-
 .../2022-09-01/virtualnetworks/predicates.go  |  24 +-
 .../virtualnetworktaps/predicates.go          |  10 +-
 .../virtualrouterpeerings/predicates.go       |   8 +-
 .../2022-09-01/virtualrouters/predicates.go   |  10 +-
 .../2022-09-01/virtualwans/predicates.go      | 142 ++++++------
 .../vmsspublicipaddresses/predicates.go       |  10 +-
 .../predicates.go                             |  10 +-
 .../2022-09-01/webcategories/predicates.go    |   8 +-
 .../adminrulecollections/predicates.go        |   8 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../applicationgateways/predicates.go         |  14 +-
 .../predicates.go                             |   6 +-
 .../applicationsecuritygroups/predicates.go   |  10 +-
 .../availabledelegations/predicates.go        |   8 +-
 .../availableservicealiases/predicates.go     |   8 +-
 .../2022-11-01/azurefirewalls/predicates.go   |  10 +-
 .../2022-11-01/bastionhosts/predicates.go     |  42 ++--
 .../bastionshareablelink/predicates.go        |   6 +-
 .../bgpservicecommunities/predicates.go       |   8 +-
 .../predicates.go                             |  10 +-
 .../connectivityconfigurations/predicates.go  |   8 +-
 .../2022-11-01/customipprefixes/predicates.go |  10 +-
 .../ddosprotectionplans/predicates.go         |  10 +-
 .../dscpconfigurations/predicates.go          |  10 +-
 .../2022-11-01/endpointservices/predicates.go |   6 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../expressroutecircuitpeerings/predicates.go |   8 +-
 .../expressroutecircuits/predicates.go        |  10 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |  10 +-
 .../expressroutelinks/predicates.go           |   6 +-
 .../predicates.go                             |   8 +-
 .../expressrouteports/predicates.go           |  10 +-
 .../expressrouteportslocations/predicates.go  |   8 +-
 .../predicates.go                             |   8 +-
 .../2022-11-01/firewallpolicies/predicates.go |  10 +-
 .../predicates.go                             |   8 +-
 .../network/2022-11-01/flowlogs/predicates.go |  10 +-
 .../2022-11-01/ipallocations/predicates.go    |  10 +-
 .../network/2022-11-01/ipgroups/predicates.go |  10 +-
 .../2022-11-01/loadbalancers/predicates.go    |  68 +++---
 .../localnetworkgateways/predicates.go        |  10 +-
 .../2022-11-01/natgateways/predicates.go      |  10 +-
 .../2022-11-01/networkgroups/predicates.go    |   8 +-
 .../networkinterfaces/predicates.go           |  36 +--
 .../networkmanagerconnections/predicates.go   |   8 +-
 .../2022-11-01/networkmanagers/predicates.go  |  10 +-
 .../2022-11-01/networkprofiles/predicates.go  |  10 +-
 .../networksecuritygroups/predicates.go       |  10 +-
 .../networkvirtualappliances/predicates.go    |  10 +-
 .../predicates.go                             |   8 +-
 .../privatednszonegroups/predicates.go        |   6 +-
 .../2022-11-01/privateendpoints/predicates.go |  20 +-
 .../privatelinkservices/predicates.go         |  20 +-
 .../publicipaddresses/predicates.go           |  10 +-
 .../2022-11-01/publicipprefixes/predicates.go |  10 +-
 .../2022-11-01/routefilterrules/predicates.go |   8 +-
 .../2022-11-01/routefilters/predicates.go     |   8 +-
 .../network/2022-11-01/routes/predicates.go   |   8 +-
 .../2022-11-01/routetables/predicates.go      |  10 +-
 .../2022-11-01/scopeconnections/predicates.go |   8 +-
 .../securityadminconfigurations/predicates.go |   8 +-
 .../securitypartnerproviders/predicates.go    |  10 +-
 .../2022-11-01/securityrules/predicates.go    |   8 +-
 .../serviceendpointpolicies/predicates.go     |  12 +-
 .../predicates.go                             |   8 +-
 .../2022-11-01/servicetags/predicates.go      |   6 +-
 .../2022-11-01/staticmembers/predicates.go    |   8 +-
 .../network/2022-11-01/subnets/predicates.go  |   8 +-
 .../network/2022-11-01/usages/predicates.go   |   2 +-
 .../virtualappliancesites/predicates.go       |   8 +-
 .../virtualapplianceskus/predicates.go        |  10 +-
 .../predicates.go                             |  10 +-
 .../virtualnetworkgateways/predicates.go      |  28 +--
 .../virtualnetworkpeerings/predicates.go      |   8 +-
 .../2022-11-01/virtualnetworks/predicates.go  |  24 +-
 .../virtualnetworktaps/predicates.go          |  10 +-
 .../virtualrouterpeerings/predicates.go       |   8 +-
 .../2022-11-01/virtualrouters/predicates.go   |  10 +-
 .../2022-11-01/virtualwans/predicates.go      | 146 ++++++------
 .../vmsspublicipaddresses/predicates.go       |  10 +-
 .../predicates.go                             |  10 +-
 .../2022-11-01/webcategories/predicates.go    |   8 +-
 .../adminrulecollections/predicates.go        |   8 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../applicationgateways/predicates.go         |  14 +-
 .../predicates.go                             |   6 +-
 .../applicationsecuritygroups/predicates.go   |  10 +-
 .../availabledelegations/predicates.go        |   8 +-
 .../availableservicealiases/predicates.go     |   8 +-
 .../2023-02-01/azurefirewalls/predicates.go   |  10 +-
 .../2023-02-01/bastionhosts/predicates.go     |  42 ++--
 .../bastionshareablelink/predicates.go        |   6 +-
 .../bgpservicecommunities/predicates.go       |   8 +-
 .../predicates.go                             |  10 +-
 .../connectivityconfigurations/predicates.go  |   8 +-
 .../2023-02-01/customipprefixes/predicates.go |  10 +-
 .../ddosprotectionplans/predicates.go         |  10 +-
 .../dscpconfigurations/predicates.go          |  10 +-
 .../2023-02-01/endpointservices/predicates.go |   6 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../expressroutecircuitpeerings/predicates.go |   8 +-
 .../expressroutecircuits/predicates.go        |  10 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |  10 +-
 .../expressroutelinks/predicates.go           |   6 +-
 .../predicates.go                             |   8 +-
 .../expressrouteports/predicates.go           |  10 +-
 .../expressrouteportslocations/predicates.go  |   8 +-
 .../predicates.go                             |   8 +-
 .../2023-02-01/firewallpolicies/predicates.go |  10 +-
 .../predicates.go                             |   8 +-
 .../network/2023-02-01/flowlogs/predicates.go |  10 +-
 .../2023-02-01/ipallocations/predicates.go    |  10 +-
 .../network/2023-02-01/ipgroups/predicates.go |  10 +-
 .../2023-02-01/loadbalancers/predicates.go    |  68 +++---
 .../localnetworkgateways/predicates.go        |  10 +-
 .../2023-02-01/natgateways/predicates.go      |  10 +-
 .../2023-02-01/networkgroups/predicates.go    |   8 +-
 .../networkinterfaces/predicates.go           |  36 +--
 .../networkmanagerconnections/predicates.go   |   8 +-
 .../2023-02-01/networkmanagers/predicates.go  |  10 +-
 .../2023-02-01/networkprofiles/predicates.go  |  10 +-
 .../networksecuritygroups/predicates.go       |  10 +-
 .../networkvirtualappliances/predicates.go    |  10 +-
 .../predicates.go                             |   8 +-
 .../privatednszonegroups/predicates.go        |   6 +-
 .../2023-02-01/privateendpoints/predicates.go |  20 +-
 .../privatelinkservices/predicates.go         |  20 +-
 .../publicipaddresses/predicates.go           |  10 +-
 .../2023-02-01/publicipprefixes/predicates.go |  10 +-
 .../2023-02-01/routefilterrules/predicates.go |   8 +-
 .../2023-02-01/routefilters/predicates.go     |   8 +-
 .../network/2023-02-01/routes/predicates.go   |   8 +-
 .../2023-02-01/routetables/predicates.go      |  10 +-
 .../2023-02-01/scopeconnections/predicates.go |   8 +-
 .../securityadminconfigurations/predicates.go |   8 +-
 .../securitypartnerproviders/predicates.go    |  10 +-
 .../2023-02-01/securityrules/predicates.go    |   8 +-
 .../serviceendpointpolicies/predicates.go     |  12 +-
 .../predicates.go                             |   8 +-
 .../2023-02-01/servicetags/predicates.go      |   6 +-
 .../2023-02-01/staticmembers/predicates.go    |   8 +-
 .../network/2023-02-01/subnets/predicates.go  |   8 +-
 .../network/2023-02-01/usages/predicates.go   |   2 +-
 .../virtualappliancesites/predicates.go       |   8 +-
 .../virtualapplianceskus/predicates.go        |  10 +-
 .../predicates.go                             |  10 +-
 .../virtualnetworkgateways/predicates.go      |  28 +--
 .../virtualnetworkpeerings/predicates.go      |   8 +-
 .../2023-02-01/virtualnetworks/predicates.go  |  24 +-
 .../virtualnetworktaps/predicates.go          |  10 +-
 .../virtualrouterpeerings/predicates.go       |   8 +-
 .../2023-02-01/virtualrouters/predicates.go   |  10 +-
 .../2023-02-01/virtualwans/predicates.go      | 146 ++++++------
 .../vmsspublicipaddresses/predicates.go       |  10 +-
 .../predicates.go                             |  10 +-
 .../2023-02-01/webcategories/predicates.go    |   8 +-
 .../adminrulecollections/predicates.go        |   8 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../applicationgateways/predicates.go         |  14 +-
 .../predicates.go                             |   6 +-
 .../applicationsecuritygroups/predicates.go   |  10 +-
 .../availabledelegations/predicates.go        |   8 +-
 .../availableservicealiases/predicates.go     |   8 +-
 .../2023-04-01/azurefirewalls/predicates.go   |  10 +-
 .../2023-04-01/bastionhosts/predicates.go     |  42 ++--
 .../bastionshareablelink/predicates.go        |   6 +-
 .../bgpservicecommunities/predicates.go       |   8 +-
 .../predicates.go                             |  10 +-
 .../connectivityconfigurations/predicates.go  |   8 +-
 .../2023-04-01/customipprefixes/predicates.go |  10 +-
 .../ddosprotectionplans/predicates.go         |  10 +-
 .../dscpconfigurations/predicates.go          |  10 +-
 .../2023-04-01/endpointservices/predicates.go |   6 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../expressroutecircuitpeerings/predicates.go |   8 +-
 .../expressroutecircuits/predicates.go        |  10 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |  10 +-
 .../expressroutelinks/predicates.go           |   6 +-
 .../predicates.go                             |   8 +-
 .../expressrouteports/predicates.go           |  10 +-
 .../expressrouteportslocations/predicates.go  |   8 +-
 .../predicates.go                             |   8 +-
 .../2023-04-01/firewallpolicies/predicates.go |  10 +-
 .../predicates.go                             |   8 +-
 .../network/2023-04-01/flowlogs/predicates.go |  10 +-
 .../2023-04-01/ipallocations/predicates.go    |  10 +-
 .../network/2023-04-01/ipgroups/predicates.go |  10 +-
 .../2023-04-01/loadbalancers/predicates.go    |  68 +++---
 .../localnetworkgateways/predicates.go        |  10 +-
 .../2023-04-01/natgateways/predicates.go      |  10 +-
 .../2023-04-01/networkgroups/predicates.go    |   8 +-
 .../networkinterfaces/predicates.go           |  36 +--
 .../networkmanagerconnections/predicates.go   |   8 +-
 .../2023-04-01/networkmanagers/predicates.go  |  10 +-
 .../2023-04-01/networkprofiles/predicates.go  |  10 +-
 .../networksecuritygroups/predicates.go       |  10 +-
 .../networkvirtualappliances/predicates.go    |  10 +-
 .../predicates.go                             |   8 +-
 .../privatednszonegroups/predicates.go        |   6 +-
 .../2023-04-01/privateendpoints/predicates.go |  20 +-
 .../privatelinkservices/predicates.go         |  20 +-
 .../publicipaddresses/predicates.go           |  10 +-
 .../2023-04-01/publicipprefixes/predicates.go |  10 +-
 .../2023-04-01/routefilterrules/predicates.go |   8 +-
 .../2023-04-01/routefilters/predicates.go     |   8 +-
 .../network/2023-04-01/routes/predicates.go   |   8 +-
 .../2023-04-01/routetables/predicates.go      |  10 +-
 .../2023-04-01/scopeconnections/predicates.go |   8 +-
 .../securityadminconfigurations/predicates.go |   8 +-
 .../securitypartnerproviders/predicates.go    |  10 +-
 .../2023-04-01/securityrules/predicates.go    |   8 +-
 .../serviceendpointpolicies/predicates.go     |  12 +-
 .../predicates.go                             |   8 +-
 .../2023-04-01/servicetags/predicates.go      |   6 +-
 .../2023-04-01/staticmembers/predicates.go    |   8 +-
 .../network/2023-04-01/subnets/predicates.go  |   8 +-
 .../network/2023-04-01/usages/predicates.go   |   2 +-
 .../virtualappliancesites/predicates.go       |   8 +-
 .../virtualapplianceskus/predicates.go        |  10 +-
 .../predicates.go                             |  10 +-
 .../virtualnetworkgateways/predicates.go      |  28 +--
 .../virtualnetworkpeerings/predicates.go      |   8 +-
 .../2023-04-01/virtualnetworks/predicates.go  |  24 +-
 .../virtualnetworktaps/predicates.go          |  10 +-
 .../virtualrouterpeerings/predicates.go       |   8 +-
 .../2023-04-01/virtualrouters/predicates.go   |  10 +-
 .../2023-04-01/virtualwans/predicates.go      | 146 ++++++------
 .../vmsspublicipaddresses/predicates.go       |  10 +-
 .../predicates.go                             |  10 +-
 .../2023-04-01/webcategories/predicates.go    |   8 +-
 .../azuretrafficcollectors/predicates.go      |  10 +-
 .../collectorpolicies/predicates.go           |  10 +-
 .../azuretrafficcollectors/predicates.go      |   8 +-
 .../collectorpolicies/predicates.go           |   8 +-
 .../2022-07-01/accounts/predicates.go         |   6 +-
 .../2022-07-01/monitors/predicates.go         |  24 +-
 .../2022-07-01/organizations/predicates.go    |   6 +-
 .../newrelic/2022-07-01/plan/predicates.go    |   6 +-
 .../2022-07-01/tagrules/predicates.go         |   6 +-
 .../2022-08-01/nginxcertificate/predicates.go |   8 +-
 .../nginxconfiguration/predicates.go          |   8 +-
 .../2022-08-01/nginxdeployment/predicates.go  |   8 +-
 .../2017-04-01/namespaces/predicates.go       |  16 +-
 .../2017-04-01/notificationhubs/predicates.go |  16 +-
 .../2019-09-01/querypackqueries/predicates.go |   6 +-
 .../2019-09-01/querypacks/predicates.go       |   6 +-
 .../2020-08-01/clusters/predicates.go         |   6 +-
 .../2020-08-01/datasources/predicates.go      |   8 +-
 .../2020-08-01/storageinsights/predicates.go  |   8 +-
 .../orbital/2022-11-01/contact/predicates.go  |   8 +-
 .../2022-11-01/contactprofile/predicates.go   |   6 +-
 .../2022-11-01/groundstation/predicates.go    |   8 +-
 .../2022-11-01/spacecraft/predicates.go       |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../2022-08-29/firewalls/predicates.go        |   6 +-
 .../2022-08-29/firewallstatus/predicates.go   |   6 +-
 .../fqdnlistglobalrulestack/predicates.go     |   6 +-
 .../fqdnlistlocalrulestack/predicates.go      |   6 +-
 .../2022-08-29/globalrulestack/predicates.go  |   6 +-
 .../2022-08-29/localrules/predicates.go       |   6 +-
 .../2022-08-29/localrulestacks/predicates.go  |   6 +-
 .../2022-08-29/postrules/predicates.go        |   6 +-
 .../prefixlistglobalrulestack/predicates.go   |   6 +-
 .../prefixlistlocalrulestack/predicates.go    |   6 +-
 .../2022-08-29/prerules/predicates.go         |   6 +-
 .../2021-10-01/remediations/predicates.go     |  18 +-
 .../2022-09-01/attestations/predicates.go     |   6 +-
 .../dashboard/predicates.go                   |   6 +-
 .../serversecurityalertpolicies/predicates.go |   6 +-
 .../virtualnetworkrules/predicates.go         |   6 +-
 .../2018-06-01/advisors/predicates.go         |   8 +-
 .../predicates.go                             |   6 +-
 .../privateendpointconnections/predicates.go  |   6 +-
 .../privatelinkresources/predicates.go        |   6 +-
 .../2018-06-01/querytexts/predicates.go       |   6 +-
 .../recommendedactions/predicates.go          |   6 +-
 .../topquerystatistics/predicates.go          |   6 +-
 .../2018-06-01/waitstatistics/predicates.go   |   6 +-
 .../2020-01-01/serverkeys/predicates.go       |   8 +-
 .../2021-06-01/configurations/predicates.go   |   6 +-
 .../2021-06-01/databases/predicates.go        |   6 +-
 .../2021-06-01/firewallrules/predicates.go    |   6 +-
 .../locationbasedcapabilities/predicates.go   |   8 +-
 .../2021-06-01/servers/predicates.go          |   6 +-
 .../administrators/predicates.go              |   6 +-
 .../2022-03-08-preview/backups/predicates.go  |   6 +-
 .../configurations/predicates.go              |   6 +-
 .../databases/predicates.go                   |   6 +-
 .../firewallrules/predicates.go               |   6 +-
 .../locationbasedcapabilities/predicates.go   |  10 +-
 .../2022-03-08-preview/servers/predicates.go  |   6 +-
 .../2022-12-01/administrators/predicates.go   |   6 +-
 .../2022-12-01/backups/predicates.go          |   6 +-
 .../2022-12-01/configurations/predicates.go   |   6 +-
 .../2022-12-01/databases/predicates.go        |   6 +-
 .../2022-12-01/firewallrules/predicates.go    |   6 +-
 .../locationbasedcapabilities/predicates.go   |  10 +-
 .../2022-12-01/servers/predicates.go          |   6 +-
 .../administrators/predicates.go              |   6 +-
 .../2023-03-01-preview/backups/predicates.go  |   6 +-
 .../configurations/predicates.go              |   6 +-
 .../databases/predicates.go                   |   6 +-
 .../firewallrules/predicates.go               |   6 +-
 .../flexibleservercapabilities/predicates.go  |   4 +-
 .../locationbasedcapabilities/predicates.go   |   4 +-
 .../2023-03-01-preview/logfiles/predicates.go |   6 +-
 .../longtermretentionbackup/predicates.go     |   2 +-
 .../migrations/predicates.go                  |   6 +-
 .../2023-03-01-preview/servers/predicates.go  |   6 +-
 .../configurations/predicates.go              |  12 +-
 .../servergroups/predicates.go                |   6 +-
 .../2022-11-08/clusters/predicates.go         |   6 +-
 .../2022-11-08/configurations/predicates.go   |  12 +-
 .../2020-06-01/privatezones/predicates.go     |  10 +-
 .../2020-06-01/recordsets/predicates.go       |   8 +-
 .../virtualnetworklinks/predicates.go         |  10 +-
 .../purview/2021-07-01/account/predicates.go  |   8 +-
 .../privateendpointconnection/predicates.go   |   6 +-
 .../privatelinkresource/predicates.go         |   6 +-
 .../purview/2021-12-01/account/predicates.go  |   8 +-
 .../kafkaconfiguration/predicates.go          |   6 +-
 .../privateendpointconnection/predicates.go   |   6 +-
 .../privatelinkresource/predicates.go         |   6 +-
 .../2022-10-12/filesystems/predicates.go      |   6 +-
 .../listprivatelinkresources/predicates.go    |   6 +-
 .../2021-08-01/vaults/predicates.go           |   8 +-
 .../listprivatelinkresources/predicates.go    |   6 +-
 .../2021-12-01/vaults/predicates.go           |   8 +-
 .../listprivatelinkresources/predicates.go    |   6 +-
 .../2022-03-01/vaults/predicates.go           |   8 +-
 .../listprivatelinkresources/predicates.go    |   6 +-
 .../2022-08-01/vaults/predicates.go           |   8 +-
 .../listprivatelinkresources/predicates.go    |   6 +-
 .../2022-09-10/vaults/predicates.go           |   8 +-
 .../listprivatelinkresources/predicates.go    |   6 +-
 .../2022-10-01/vaults/predicates.go           |   8 +-
 .../listprivatelinkresources/predicates.go    |   6 +-
 .../2023-02-01/vaults/predicates.go           |   8 +-
 .../listprivatelinkresources/predicates.go    |   6 +-
 .../2023-04-01/vaults/predicates.go           |   8 +-
 .../2023-01-15/backupcrrjobs/predicates.go    |  10 +-
 .../backupprotecteditemscrr/predicates.go     |  10 +-
 .../recoverypointscrr/predicates.go           |  10 +-
 .../2023-02-01/backupengines/predicates.go    |  10 +-
 .../2023-02-01/backupjobs/predicates.go       |  10 +-
 .../2023-02-01/backuppolicies/predicates.go   |  10 +-
 .../backupprotectableitems/predicates.go      |  10 +-
 .../backupprotecteditems/predicates.go        |  10 +-
 .../backupprotectioncontainers/predicates.go  |  10 +-
 .../backupprotectionintent/predicates.go      |  10 +-
 .../backupworkloaditems/predicates.go         |  10 +-
 .../protectablecontainers/predicates.go       |  10 +-
 .../2023-02-01/recoverypoints/predicates.go   |  10 +-
 .../predicates.go                             |  10 +-
 .../resourceguardproxies/predicates.go        |  10 +-
 .../softdeletedcontainers/predicates.go       |  10 +-
 .../2023-04-01/backupengines/predicates.go    |  10 +-
 .../2023-04-01/backupjobs/predicates.go       |  10 +-
 .../2023-04-01/backuppolicies/predicates.go   |  10 +-
 .../backupprotectableitems/predicates.go      |  10 +-
 .../backupprotecteditems/predicates.go        |  10 +-
 .../backupprotectioncontainers/predicates.go  |  10 +-
 .../backupprotectionintent/predicates.go      |  10 +-
 .../backupworkloaditems/predicates.go         |  10 +-
 .../protectablecontainers/predicates.go       |  10 +-
 .../2023-04-01/recoverypoints/predicates.go   |  10 +-
 .../predicates.go                             |  10 +-
 .../resourceguardproxies/predicates.go        |  10 +-
 .../softdeletedcontainers/predicates.go       |  10 +-
 .../migrationrecoverypoints/predicates.go     |   8 +-
 .../2022-10-01/operations/predicates.go       |   6 +-
 .../2022-10-01/recoverypoints/predicates.go   |   8 +-
 .../replicationalertsettings/predicates.go    |   8 +-
 .../replicationevents/predicates.go           |   8 +-
 .../replicationfabrics/predicates.go          |   8 +-
 .../2022-10-01/replicationjobs/predicates.go  |   8 +-
 .../replicationlogicalnetworks/predicates.go  |   8 +-
 .../replicationmigrationitems/predicates.go   |   8 +-
 .../replicationnetworkmappings/predicates.go  |   8 +-
 .../replicationnetworks/predicates.go         |   8 +-
 .../replicationpolicies/predicates.go         |   8 +-
 .../replicationprotectableitems/predicates.go |   8 +-
 .../replicationprotecteditems/predicates.go   |   8 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../replicationrecoveryplans/predicates.go    |   8 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../replicationvaultsetting/predicates.go     |   8 +-
 .../replicationvcenters/predicates.go         |   8 +-
 .../targetcomputesizes/predicates.go          |   6 +-
 .../migrationrecoverypoints/predicates.go     |   8 +-
 .../2023-01-01/operations/predicates.go       |   6 +-
 .../2023-01-01/recoverypoints/predicates.go   |   8 +-
 .../replicationalertsettings/predicates.go    |   8 +-
 .../replicationevents/predicates.go           |   8 +-
 .../replicationfabrics/predicates.go          |   8 +-
 .../2023-01-01/replicationjobs/predicates.go  |   8 +-
 .../replicationlogicalnetworks/predicates.go  |   8 +-
 .../replicationmigrationitems/predicates.go   |   8 +-
 .../replicationnetworkmappings/predicates.go  |   8 +-
 .../replicationnetworks/predicates.go         |   8 +-
 .../replicationpolicies/predicates.go         |   8 +-
 .../replicationprotectableitems/predicates.go |   8 +-
 .../replicationprotecteditems/predicates.go   |   8 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../replicationrecoveryplans/predicates.go    |   8 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../replicationvaultsetting/predicates.go     |   8 +-
 .../replicationvcenters/predicates.go         |   8 +-
 .../targetcomputesizes/predicates.go          |   6 +-
 .../migrationrecoverypoints/predicates.go     |   8 +-
 .../2023-02-01/operations/predicates.go       |   6 +-
 .../2023-02-01/recoverypoints/predicates.go   |   8 +-
 .../replicationalertsettings/predicates.go    |   8 +-
 .../replicationevents/predicates.go           |   8 +-
 .../replicationfabrics/predicates.go          |   8 +-
 .../2023-02-01/replicationjobs/predicates.go  |   8 +-
 .../replicationlogicalnetworks/predicates.go  |   8 +-
 .../replicationmigrationitems/predicates.go   |   8 +-
 .../replicationnetworkmappings/predicates.go  |   8 +-
 .../replicationnetworks/predicates.go         |   8 +-
 .../replicationpolicies/predicates.go         |   8 +-
 .../replicationprotectableitems/predicates.go |   8 +-
 .../replicationprotecteditems/predicates.go   |   8 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../replicationrecoveryplans/predicates.go    |   8 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../replicationvaultsetting/predicates.go     |   8 +-
 .../replicationvcenters/predicates.go         |   8 +-
 .../targetcomputesizes/predicates.go          |   6 +-
 .../migrationrecoverypoints/predicates.go     |   8 +-
 .../2023-04-01/operations/predicates.go       |   6 +-
 .../2023-04-01/recoverypoints/predicates.go   |   8 +-
 .../replicationalertsettings/predicates.go    |   8 +-
 .../replicationevents/predicates.go           |   8 +-
 .../replicationfabrics/predicates.go          |   8 +-
 .../2023-04-01/replicationjobs/predicates.go  |   8 +-
 .../replicationlogicalnetworks/predicates.go  |   8 +-
 .../replicationmigrationitems/predicates.go   |   8 +-
 .../replicationnetworkmappings/predicates.go  |   8 +-
 .../replicationnetworks/predicates.go         |   8 +-
 .../replicationpolicies/predicates.go         |   8 +-
 .../replicationprotectableitems/predicates.go |   8 +-
 .../replicationprotecteditems/predicates.go   |   8 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../replicationrecoveryplans/predicates.go    |   8 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../predicates.go                             |   8 +-
 .../replicationvaultsetting/predicates.go     |   8 +-
 .../replicationvcenters/predicates.go         |   8 +-
 .../targetcomputesizes/predicates.go          |   6 +-
 .../openshiftclusters/predicates.go           |   6 +-
 .../2022-09-04/machinepools/predicates.go     |   6 +-
 .../openshiftclusters/predicates.go           |   6 +-
 .../openshiftversions/predicates.go           |   6 +-
 .../2022-09-04/secrets/predicates.go          |   6 +-
 .../syncidentityproviders/predicates.go       |   6 +-
 .../2022-09-04/syncsets/predicates.go         |   6 +-
 .../2023-04-01/machinepools/predicates.go     |   6 +-
 .../openshiftclusters/predicates.go           |   6 +-
 .../openshiftversions/predicates.go           |   6 +-
 .../2023-04-01/secrets/predicates.go          |   6 +-
 .../syncidentityproviders/predicates.go       |   6 +-
 .../2023-04-01/syncsets/predicates.go         |   6 +-
 .../2022-06-01/firewallrules/predicates.go    |   6 +-
 .../2022-06-01/patchschedules/predicates.go   |   8 +-
 .../redis/2022-06-01/redis/predicates.go      |  30 +--
 .../2023-04-01/firewallrules/predicates.go    |   6 +-
 .../2023-04-01/patchschedules/predicates.go   |   8 +-
 .../redis/2023-04-01/redis/predicates.go      |  30 +--
 .../2022-01-01/databases/predicates.go        |   6 +-
 .../2022-01-01/redisenterprise/predicates.go  |  12 +-
 .../hybridconnections/predicates.go           |  12 +-
 .../relay/2017-04-01/namespaces/predicates.go |  12 +-
 .../relay/2017-04-01/wcfrelays/predicates.go  |  12 +-
 .../hybridconnections/predicates.go           |  16 +-
 .../relay/2021-11-01/namespaces/predicates.go |  14 +-
 .../predicates.go                             |   8 +-
 .../relay/2021-11-01/wcfrelays/predicates.go  |  16 +-
 .../2022-10-27/appliances/predicates.go       |   6 +-
 .../2020-05-01/managementlocks/predicates.go  |   6 +-
 .../deploymentoperations/predicates.go        |   4 +-
 .../2020-06-01/deployments/predicates.go      |   8 +-
 .../2020-06-01/providers/predicates.go        |   8 +-
 .../2020-06-01/resourcegroups/predicates.go   |  28 +--
 .../2020-06-01/resources/predicates.go        |  20 +-
 .../deploymentoperations/predicates.go        |   4 +-
 .../2020-10-01/deployments/predicates.go      |   8 +-
 .../2020-10-01/providers/predicates.go        |   8 +-
 .../2020-10-01/resourcegroups/predicates.go   |  28 +--
 .../2020-10-01/resources/predicates.go        |  20 +-
 .../deploymentoperations/predicates.go        |   4 +-
 .../2021-04-01/deployments/predicates.go      |   8 +-
 .../2021-04-01/providers/predicates.go        |   8 +-
 .../2021-04-01/resourcegroups/predicates.go   |  28 +--
 .../2021-04-01/resources/predicates.go        |  20 +-
 .../policyassignments/predicates.go           |   8 +-
 .../policydefinitions/predicates.go           |   6 +-
 .../policysetdefinitions/predicates.go        |   6 +-
 .../policyassignments/predicates.go           |   8 +-
 .../policyexemptions/predicates.go            |   6 +-
 .../deploymentoperations/predicates.go        |   4 +-
 .../2022-09-01/deployments/predicates.go      |   8 +-
 .../2022-09-01/providers/predicates.go        |   8 +-
 .../2022-09-01/resourcegroups/predicates.go   |  28 +--
 .../2022-09-01/resources/predicates.go        |  20 +-
 .../2022-12-01/subscriptions/predicates.go    |  10 +-
 .../2022-12-01/tenants/predicates.go          |  16 +-
 .../privateendpointconnections/predicates.go  |   6 +-
 .../search/2022-09-01/querykeys/predicates.go |   4 +-
 .../search/2022-09-01/services/predicates.go  |   6 +-
 .../sharedprivatelinkresources/predicates.go  |   6 +-
 .../autoprovisioningsettings/predicates.go    |   6 +-
 .../compliances/predicates.go                 |   6 +-
 .../devicesecuritygroups/predicates.go        |   6 +-
 .../predicates.go                             |   6 +-
 .../iotsecuritysolutions/predicates.go        |   8 +-
 .../predicates.go                             |  12 +-
 .../2017-08-01-preview/pricings/predicates.go |   6 +-
 .../securitycontacts/predicates.go            |   6 +-
 .../workspacesettings/predicates.go           |   6 +-
 .../alertssuppressionrules/predicates.go      |   6 +-
 .../assessments/predicates.go                 |   6 +-
 .../assessmentsmetadata/predicates.go         |   6 +-
 .../automations/predicates.go                 |  12 +-
 .../regulatorycompliance/predicates.go        |  18 +-
 .../subassessments/predicates.go              |   6 +-
 .../security/2019-01-01/alerts/predicates.go  |   6 +-
 .../adaptivenetworkhardenings/predicates.go   |   6 +-
 .../security/2020-01-01/alerts/predicates.go  |   6 +-
 .../allowedconnections/predicates.go          |   8 +-
 .../2020-01-01/assessments/predicates.go      |   6 +-
 .../assessmentsmetadata/predicates.go         |   6 +-
 .../discoveredsecuritysolutions/predicates.go |   8 +-
 .../jitnetworkaccesspolicies/predicates.go    |  10 +-
 .../2020-01-01/securescore/predicates.go      |  12 +-
 .../predicates.go                             |   6 +-
 .../securescorecontrols/predicates.go         |   6 +-
 .../securitysolutions/predicates.go           |   8 +-
 .../2020-01-01/topology/predicates.go         |   8 +-
 .../2021-06-01/assessments/predicates.go      |   6 +-
 .../assessmentsmetadata/predicates.go         |   6 +-
 .../2021-09-01-preview/actions/predicates.go  |   8 +-
 .../automationrules/predicates.go             |   8 +-
 .../bookmarkrelations/predicates.go           |   8 +-
 .../bookmarks/predicates.go                   |   8 +-
 .../2021-09-01-preview/entities/predicates.go |   6 +-
 .../entityrelations/predicates.go             |   8 +-
 .../incidentcomments/predicates.go            |   8 +-
 .../incidentrelations/predicates.go           |   8 +-
 .../incidents/predicates.go                   |   8 +-
 .../2021-09-01-preview/metadata/predicates.go |   8 +-
 .../officeconsents/predicates.go              |   6 +-
 .../repositories/predicates.go                |   4 +-
 .../sourcecontrols/predicates.go              |   8 +-
 .../watchlistitems/predicates.go              |   8 +-
 .../watchlists/predicates.go                  |   8 +-
 .../2022-07-01-preview/actions/predicates.go  |   8 +-
 .../automationrules/predicates.go             |   8 +-
 .../bookmarkrelations/predicates.go           |   8 +-
 .../bookmarks/predicates.go                   |   8 +-
 .../2022-07-01-preview/entities/predicates.go |   6 +-
 .../entityrelations/predicates.go             |   8 +-
 .../incidentcomments/predicates.go            |   8 +-
 .../incidentrelations/predicates.go           |   8 +-
 .../incidents/predicates.go                   |   8 +-
 .../2022-07-01-preview/metadata/predicates.go |   8 +-
 .../officeconsents/predicates.go              |   6 +-
 .../repositories/predicates.go                |   4 +-
 .../sourcecontrols/predicates.go              |   8 +-
 .../watchlistitems/predicates.go              |   8 +-
 .../watchlists/predicates.go                  |   8 +-
 .../2022-08-01/actions/predicates.go          |   8 +-
 .../2022-08-01/automationrules/predicates.go  |   8 +-
 .../2022-08-01/bookmarks/predicates.go        |   8 +-
 .../2022-08-01/incidentcomments/predicates.go |   8 +-
 .../incidentrelations/predicates.go           |   8 +-
 .../2022-08-01/incidents/predicates.go        |   8 +-
 .../2022-08-01/watchlistitems/predicates.go   |   8 +-
 .../2022-08-01/watchlists/predicates.go       |   8 +-
 .../2022-10-01-preview/actions/predicates.go  |   8 +-
 .../automationrules/predicates.go             |   8 +-
 .../bookmarkrelations/predicates.go           |   8 +-
 .../bookmarks/predicates.go                   |   8 +-
 .../2022-10-01-preview/entities/predicates.go |   6 +-
 .../entityrelations/predicates.go             |   8 +-
 .../fileimports/predicates.go                 |   6 +-
 .../incidentcomments/predicates.go            |   8 +-
 .../incidentrelations/predicates.go           |   8 +-
 .../incidents/predicates.go                   |   8 +-
 .../2022-10-01-preview/metadata/predicates.go |   8 +-
 .../officeconsents/predicates.go              |   6 +-
 .../repositories/predicates.go                |   4 +-
 .../sourcecontrols/predicates.go              |   8 +-
 .../watchlistitems/predicates.go              |   8 +-
 .../watchlists/predicates.go                  |   8 +-
 .../2022-11-01/actions/predicates.go          |   8 +-
 .../2022-11-01/automationrules/predicates.go  |   8 +-
 .../2022-11-01/bookmarks/predicates.go        |   8 +-
 .../2022-11-01/incidentcomments/predicates.go |   8 +-
 .../incidentrelations/predicates.go           |   8 +-
 .../2022-11-01/incidents/predicates.go        |   8 +-
 .../2022-11-01/watchlistitems/predicates.go   |   8 +-
 .../2022-11-01/watchlists/predicates.go       |   8 +-
 .../2023-02-01/actions/predicates.go          |   8 +-
 .../2023-02-01/automationrules/predicates.go  |   8 +-
 .../2023-02-01/bookmarks/predicates.go        |   8 +-
 .../2023-02-01/incidentcomments/predicates.go |   8 +-
 .../incidentrelations/predicates.go           |   8 +-
 .../2023-02-01/incidents/predicates.go        |   8 +-
 .../2023-02-01/metadata/predicates.go         |   8 +-
 .../2023-02-01/watchlistitems/predicates.go   |   8 +-
 .../2023-02-01/watchlists/predicates.go       |   8 +-
 .../disasterrecoveryconfigs/predicates.go     |  12 +-
 .../migrationconfigs/predicates.go            |   6 +-
 .../namespaces/predicates.go                  |  12 +-
 .../namespacesauthorizationrule/predicates.go |   6 +-
 .../predicates.go                             |   6 +-
 .../2021-06-01-preview/queues/predicates.go   |   6 +-
 .../queuesauthorizationrule/predicates.go     |   6 +-
 .../2021-06-01-preview/rules/predicates.go    |   6 +-
 .../subscriptions/predicates.go               |   6 +-
 .../2021-06-01-preview/topics/predicates.go   |   6 +-
 .../topicsauthorizationrule/predicates.go     |   6 +-
 .../disasterrecoveryconfigs/predicates.go     |  16 +-
 .../2021-11-01/migrationconfigs/predicates.go |   8 +-
 .../2021-11-01/namespaces/predicates.go       |  14 +-
 .../namespacesauthorizationrule/predicates.go |   8 +-
 .../predicates.go                             |   8 +-
 .../2021-11-01/queues/predicates.go           |   8 +-
 .../queuesauthorizationrule/predicates.go     |   8 +-
 .../servicebus/2021-11-01/rules/predicates.go |   8 +-
 .../2021-11-01/subscriptions/predicates.go    |   8 +-
 .../2021-11-01/topics/predicates.go           |   8 +-
 .../topicsauthorizationrule/predicates.go     |   8 +-
 .../disasterrecoveryconfigs/predicates.go     |  16 +-
 .../migrationconfigs/predicates.go            |   8 +-
 .../namespaces/predicates.go                  |  14 +-
 .../namespacesauthorizationrule/predicates.go |   8 +-
 .../predicates.go                             |   8 +-
 .../2022-01-01-preview/queues/predicates.go   |   8 +-
 .../queuesauthorizationrule/predicates.go     |   8 +-
 .../2022-01-01-preview/rules/predicates.go    |   8 +-
 .../subscriptions/predicates.go               |   8 +-
 .../2022-01-01-preview/topics/predicates.go   |   8 +-
 .../topicsauthorizationrule/predicates.go     |   8 +-
 .../2021-05-01/application/predicates.go      |   8 +-
 .../2021-05-01/applicationtype/predicates.go  |   8 +-
 .../applicationtypeversion/predicates.go      |   8 +-
 .../2021-05-01/managedcluster/predicates.go   |   8 +-
 .../2021-05-01/nodetype/predicates.go         |   6 +-
 .../2021-05-01/service/predicates.go          |   8 +-
 .../2022-01-01/application/predicates.go      |   8 +-
 .../2022-01-01/applicationtype/predicates.go  |   8 +-
 .../applicationtypeversion/predicates.go      |   8 +-
 .../2022-01-01/managedcluster/predicates.go   |   8 +-
 .../2022-01-01/managedvmsizes/predicates.go   |   6 +-
 .../2022-01-01/nodetype/predicates.go         |   8 +-
 .../2022-01-01/service/predicates.go          |   8 +-
 .../2022-05-01/servicelinker/predicates.go    |   6 +-
 .../associationsinterface/predicates.go       |   6 +-
 .../frontendsinterface/predicates.go          |   6 +-
 .../trafficcontrollerinterface/predicates.go  |   6 +-
 .../signalr/2023-02-01/signalr/predicates.go  |  46 ++--
 .../blobauditing/predicates.go                |  26 +--
 .../databases/predicates.go                   |  14 +-
 .../predicates.go                             |   6 +-
 .../jobagents/predicates.go                   |   6 +-
 .../jobcredentials/predicates.go              |   6 +-
 .../jobexecutions/predicates.go               |   6 +-
 .../sql/2017-03-01-preview/jobs/predicates.go |   6 +-
 .../jobstepexecutions/predicates.go           |   6 +-
 .../2017-03-01-preview/jobsteps/predicates.go |   6 +-
 .../jobtargetexecutions/predicates.go         |   6 +-
 .../jobtargetgroups/predicates.go             |   6 +-
 .../jobversions/predicates.go                 |   6 +-
 .../longtermretentionbackups/predicates.go    |   6 +-
 .../predicates.go                             |   6 +-
 .../manageddatabases/predicates.go            |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../sensitivitylabels/predicates.go           |   6 +-
 .../serverdnsaliases/predicates.go            |   6 +-
 .../serversecurityalertpolicies/predicates.go |   6 +-
 .../databasecolumns/predicates.go             |   6 +-
 .../databaseschemas/predicates.go             |   6 +-
 .../predicates.go                             |   6 +-
 .../databasetables/predicates.go              |   6 +-
 .../instancepools/predicates.go               |   6 +-
 .../predicates.go                             |   6 +-
 .../manageddatabasecolumns/predicates.go      |   6 +-
 .../manageddatabases/predicates.go            |   6 +-
 .../manageddatabaseschemas/predicates.go      |   6 +-
 .../predicates.go                             |   6 +-
 .../manageddatabasetables/predicates.go       |   6 +-
 .../predicates.go                             |   6 +-
 .../managedinstanceoperations/predicates.go   |   6 +-
 .../managedinstances/predicates.go            |   6 +-
 .../predicates.go                             |   6 +-
 .../privateendpointconnections/predicates.go  |   6 +-
 .../privatelinkresources/predicates.go        |   6 +-
 .../serverazureadadministrators/predicates.go |   6 +-
 .../predicates.go                             |   6 +-
 .../2018-06-01-preview/usages/predicates.go   |  12 +-
 .../predicates.go                             |   6 +-
 .../blobauditing/predicates.go                |  26 +--
 .../databasecolumns/predicates.go             |   6 +-
 .../databaseextensions/predicates.go          |   6 +-
 .../databaseoperations/predicates.go          |   6 +-
 .../databases/predicates.go                   |  10 +-
 .../databaseschemas/predicates.go             |   6 +-
 .../predicates.go                             |   6 +-
 .../databasetables/predicates.go              |   6 +-
 .../databaseusages/predicates.go              |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../datawarehouseuseractivities/predicates.go |   6 +-
 .../deletedservers/predicates.go              |   6 +-
 .../elasticpooloperations/predicates.go       |   6 +-
 .../elasticpools/predicates.go                |   8 +-
 .../encryptionprotectors/predicates.go        |  10 +-
 .../failovergroups/predicates.go              |   8 +-
 .../firewallrules/predicates.go               |   6 +-
 .../instancefailovergroups/predicates.go      |   6 +-
 .../instancepools/predicates.go               |   6 +-
 .../jobagents/predicates.go                   |   6 +-
 .../jobcredentials/predicates.go              |   6 +-
 .../jobexecutions/predicates.go               |   6 +-
 .../sql/2021-02-01-preview/jobs/predicates.go |   6 +-
 .../jobstepexecutions/predicates.go           |   6 +-
 .../2021-02-01-preview/jobsteps/predicates.go |   6 +-
 .../jobtargetexecutions/predicates.go         |   6 +-
 .../jobtargetgroups/predicates.go             |   6 +-
 .../jobversions/predicates.go                 |   6 +-
 .../ledgerdigestuploads/predicates.go         |   6 +-
 .../longtermretentionbackups/predicates.go    |   6 +-
 .../predicates.go                             |   6 +-
 .../longtermretentionpolicies/predicates.go   |   6 +-
 .../predicates.go                             |   6 +-
 .../manageddatabasecolumns/predicates.go      |   6 +-
 .../manageddatabasequeries/predicates.go      |   6 +-
 .../manageddatabases/predicates.go            |   6 +-
 .../manageddatabaseschemas/predicates.go      |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   8 +-
 .../manageddatabasetables/predicates.go       |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   8 +-
 .../managedinstancekeys/predicates.go         |   8 +-
 .../predicates.go                             |   6 +-
 .../managedinstanceoperations/predicates.go   |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../managedinstances/predicates.go            |  16 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../outboundfirewallrules/predicates.go       |   6 +-
 .../privateendpointconnections/predicates.go  |   6 +-
 .../privatelinkresources/predicates.go        |   6 +-
 .../recoverablemanageddatabases/predicates.go |   6 +-
 .../replicationlinks/predicates.go            |   6 +-
 .../restorabledroppeddatabases/predicates.go  |   8 +-
 .../predicates.go                             |   6 +-
 .../restorepoints/predicates.go               |   8 +-
 .../sensitivitylabels/predicates.go           |   8 +-
 .../serverazureadadministrators/predicates.go |   6 +-
 .../predicates.go                             |   6 +-
 .../serverdevopsaudit/predicates.go           |   6 +-
 .../serverdnsaliases/predicates.go            |   6 +-
 .../serverkeys/predicates.go                  |  10 +-
 .../serveroperations/predicates.go            |   6 +-
 .../2021-02-01-preview/servers/predicates.go  |   8 +-
 .../serversecurityalertpolicies/predicates.go |   6 +-
 .../servertrustgroups/predicates.go           |   6 +-
 .../predicates.go                             |   6 +-
 .../subscriptionusages/predicates.go          |   6 +-
 .../syncagents/predicates.go                  |  12 +-
 .../syncgroups/predicates.go                  |  20 +-
 .../syncmembers/predicates.go                 |   8 +-
 .../timezones/predicates.go                   |   6 +-
 .../transparentdataencryptions/predicates.go  |   6 +-
 .../2021-02-01-preview/usages/predicates.go   |  12 +-
 .../virtualclusters/predicates.go             |   6 +-
 .../virtualnetworkrules/predicates.go         |   6 +-
 .../workloadclassifiers/predicates.go         |   6 +-
 .../workloadgroups/predicates.go              |   6 +-
 .../predicates.go                             |   6 +-
 .../blobauditing/predicates.go                |  26 +--
 .../predicates.go                             |   6 +-
 .../databasecolumns/predicates.go             |   6 +-
 .../databaseextensions/predicates.go          |   6 +-
 .../databaseoperations/predicates.go          |   6 +-
 .../databases/predicates.go                   |  10 +-
 .../databaseschemas/predicates.go             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../databasetables/predicates.go              |   6 +-
 .../databaseusages/predicates.go              |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../datamaskingrules/predicates.go            |  10 +-
 .../datawarehouseuseractivities/predicates.go |   6 +-
 .../deletedservers/predicates.go              |   6 +-
 .../predicates.go                             |   6 +-
 .../elasticpooloperations/predicates.go       |   6 +-
 .../elasticpools/predicates.go                |   8 +-
 .../encryptionprotectors/predicates.go        |  10 +-
 .../endpointcertificates/predicates.go        |   6 +-
 .../failovergroups/predicates.go              |   8 +-
 .../firewallrules/predicates.go               |   6 +-
 .../geobackuppolicies/predicates.go           |  10 +-
 .../instancefailovergroups/predicates.go      |   6 +-
 .../instancepools/predicates.go               |   6 +-
 .../ipv6firewallrules/predicates.go           |   6 +-
 .../jobagents/predicates.go                   |   6 +-
 .../jobcredentials/predicates.go              |   6 +-
 .../jobexecutions/predicates.go               |   6 +-
 .../sql/2022-11-01-preview/jobs/predicates.go |   6 +-
 .../jobstepexecutions/predicates.go           |   6 +-
 .../2022-11-01-preview/jobsteps/predicates.go |   6 +-
 .../jobtargetexecutions/predicates.go         |   6 +-
 .../jobtargetgroups/predicates.go             |   6 +-
 .../jobversions/predicates.go                 |   6 +-
 .../ledgerdigestuploads/predicates.go         |   6 +-
 .../longtermretentionbackups/predicates.go    |   6 +-
 .../predicates.go                             |   6 +-
 .../longtermretentionpolicies/predicates.go   |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../manageddatabasecolumns/predicates.go      |   6 +-
 .../predicates.go                             |   6 +-
 .../manageddatabasequeries/predicates.go      |   6 +-
 .../manageddatabases/predicates.go            |   6 +-
 .../manageddatabaseschemas/predicates.go      |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   8 +-
 .../manageddatabasetables/predicates.go       |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../managedinstancedtcs/predicates.go         |   6 +-
 .../predicates.go                             |   8 +-
 .../managedinstancekeys/predicates.go         |   8 +-
 .../predicates.go                             |   6 +-
 .../managedinstanceoperations/predicates.go   |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../managedinstances/predicates.go            |  18 +-
 .../predicates.go                             |   6 +-
 .../managedledgerdigestuploads/predicates.go  |   6 +-
 .../predicates.go                             |   6 +-
 .../managedserverdnsaliases/predicates.go     |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../outboundfirewallrules/predicates.go       |   6 +-
 .../privateendpointconnections/predicates.go  |   6 +-
 .../privatelinkresources/predicates.go        |   6 +-
 .../recoverabledatabases/predicates.go        |   6 +-
 .../recoverablemanageddatabases/predicates.go |   6 +-
 .../replicationlinks/predicates.go            |   6 +-
 .../restorabledroppeddatabases/predicates.go  |   8 +-
 .../predicates.go                             |   6 +-
 .../restorepoints/predicates.go               |   8 +-
 .../sensitivitylabels/predicates.go           |   8 +-
 .../predicates.go                             |   6 +-
 .../serverazureadadministrators/predicates.go |   6 +-
 .../predicates.go                             |   6 +-
 .../serverconfigurationoptions/predicates.go  |   6 +-
 .../serverconnectionpolicies/predicates.go    |  10 +-
 .../serverdevopsaudit/predicates.go           |   6 +-
 .../serverdnsaliases/predicates.go            |   6 +-
 .../serverkeys/predicates.go                  |  10 +-
 .../serveroperations/predicates.go            |   6 +-
 .../2022-11-01-preview/servers/predicates.go  |   8 +-
 .../serversecurityalertpolicies/predicates.go |   6 +-
 .../servertrustcertificates/predicates.go     |   6 +-
 .../servertrustgroups/predicates.go           |   6 +-
 .../serverusages/predicates.go                |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../predicates.go                             |   6 +-
 .../subscriptionusages/predicates.go          |   6 +-
 .../synapselinkworkspaces/predicates.go       |   6 +-
 .../syncagents/predicates.go                  |  12 +-
 .../syncgroups/predicates.go                  |  20 +-
 .../syncmembers/predicates.go                 |   8 +-
 .../timezones/predicates.go                   |   6 +-
 .../transparentdataencryptions/predicates.go  |   6 +-
 .../2022-11-01-preview/usages/predicates.go   |  12 +-
 .../virtualclusters/predicates.go             |   6 +-
 .../virtualnetworkrules/predicates.go         |   6 +-
 .../workloadclassifiers/predicates.go         |   6 +-
 .../workloadgroups/predicates.go              |   6 +-
 .../availabilitygrouplisteners/predicates.go  |   6 +-
 .../sqlvirtualmachinegroups/predicates.go     |   6 +-
 .../sqlvirtualmachines/predicates.go          |   6 +-
 .../2022-05-01/blobcontainers/predicates.go   |   8 +-
 .../2022-05-01/deletedaccounts/predicates.go  |   6 +-
 .../2022-05-01/encryptionscopes/predicates.go |   6 +-
 .../2022-05-01/fileshares/predicates.go       |   8 +-
 .../2022-05-01/queueservice/predicates.go     |   6 +-
 .../2022-05-01/storageaccounts/predicates.go  |   6 +-
 .../2022-05-01/tableservice/predicates.go     |   6 +-
 .../2022-09-01/blobcontainers/predicates.go   |   8 +-
 .../2022-09-01/deletedaccounts/predicates.go  |   6 +-
 .../2022-09-01/encryptionscopes/predicates.go |   6 +-
 .../2022-09-01/fileshares/predicates.go       |   8 +-
 .../2022-09-01/queueservice/predicates.go     |   6 +-
 .../2022-09-01/storageaccounts/predicates.go  |   6 +-
 .../2022-09-01/tableservice/predicates.go     |   6 +-
 .../2023-01-01/blobcontainers/predicates.go   |   8 +-
 .../2023-01-01/deletedaccounts/predicates.go  |   6 +-
 .../2023-01-01/encryptionscopes/predicates.go |   6 +-
 .../2023-01-01/fileshares/predicates.go       |   8 +-
 .../2023-01-01/queueservice/predicates.go     |   6 +-
 .../2023-01-01/storageaccounts/predicates.go  |   6 +-
 .../2023-01-01/tableservice/predicates.go     |   6 +-
 .../2023-01-01/ascusages/predicates.go        |   6 +-
 .../2023-01-01/caches/predicates.go           |   8 +-
 .../2023-01-01/skus/predicates.go             |   4 +-
 .../2023-01-01/storagetargets/predicates.go   |   8 +-
 .../2023-01-01/usagemodels/predicates.go      |   4 +-
 .../2023-05-01/amlfilesystems/predicates.go   |   6 +-
 .../2023-05-01/ascusages/predicates.go        |   6 +-
 .../2023-05-01/caches/predicates.go           |   8 +-
 .../2023-05-01/skus/predicates.go             |   4 +-
 .../2023-05-01/storagetargets/predicates.go   |   8 +-
 .../2023-05-01/usagemodels/predicates.go      |   4 +-
 .../2023-03-01/agents/predicates.go           |   6 +-
 .../2023-03-01/endpoints/predicates.go        |   6 +-
 .../2023-03-01/jobdefinitions/predicates.go   |   6 +-
 .../2023-03-01/jobruns/predicates.go          |   6 +-
 .../2023-03-01/projects/predicates.go         |   6 +-
 .../2023-03-01/storagemovers/predicates.go    |   6 +-
 .../2021-08-01/diskpools/predicates.go        |  10 +-
 .../2021-08-01/iscsitargets/predicates.go     |   8 +-
 .../2021-08-01/resourceskus/predicates.go     |   8 +-
 .../2020-03-01/clusters/predicates.go         |  14 +-
 .../2020-03-01/functions/predicates.go        |   6 +-
 .../2020-03-01/inputs/predicates.go           |   6 +-
 .../2020-03-01/outputs/predicates.go          |   6 +-
 .../2020-03-01/privateendpoints/predicates.go |   8 +-
 .../2020-03-01/streamingjobs/predicates.go    |   8 +-
 .../functions/predicates.go                   |   6 +-
 .../2021-10-01-preview/inputs/predicates.go   |   6 +-
 .../2021-10-01-preview/outputs/predicates.go  |   6 +-
 .../streamingjobs/predicates.go               |   8 +-
 .../2021-10-01/subscriptions/predicates.go    |   6 +-
 .../edgemodules/predicates.go                 |   6 +-
 .../2021-05-01-preview/videos/predicates.go   |  12 +-
 .../vmware/2022-05-01/addons/predicates.go    |   6 +-
 .../2022-05-01/authorizations/predicates.go   |   6 +-
 .../2022-05-01/cloudlinks/predicates.go       |   6 +-
 .../vmware/2022-05-01/clusters/predicates.go  |   6 +-
 .../2022-05-01/datastores/predicates.go       |   6 +-
 .../globalreachconnections/predicates.go      |   6 +-
 .../hcxenterprisesites/predicates.go          |   6 +-
 .../placementpolicies/predicates.go           |   6 +-
 .../2022-05-01/privateclouds/predicates.go    |   6 +-
 .../vmware/2022-05-01/scripts/predicates.go   |  18 +-
 .../2022-05-01/virtualmachines/predicates.go  |   6 +-
 .../2022-05-01/workloadnetworks/predicates.go |  60 ++---
 .../communicationsgateways/predicates.go      |   6 +-
 .../2023-04-03/testlines/predicates.go        |   6 +-
 .../appservicecertificateorders/predicates.go |  16 +-
 .../appserviceenvironments/predicates.go      |  88 +++----
 .../2022-09-01/appserviceplans/predicates.go  |  32 +--
 .../predicates.go                             |   8 +-
 .../web/2022-09-01/certificates/predicates.go |   8 +-
 .../2022-09-01/containerapps/predicates.go    |   8 +-
 .../containerappsrevisions/predicates.go      |   8 +-
 .../2022-09-01/deletedwebapps/predicates.go   |   8 +-
 .../web/2022-09-01/diagnostics/predicates.go  |  32 +--
 .../web/2022-09-01/domains/predicates.go      |  18 +-
 .../2022-09-01/kubeenvironments/predicates.go |   8 +-
 .../web/2022-09-01/provider/predicates.go     |  28 +--
 .../2022-09-01/recommendations/predicates.go  |   8 +-
 .../resourcehealthmetadata/predicates.go      |   8 +-
 .../resourceproviders/predicates.go           |  48 ++--
 .../web/2022-09-01/staticsites/predicates.go  |  80 +++----
 .../2022-09-01/topleveldomains/predicates.go  |  10 +-
 .../web/2022-09-01/webapps/predicates.go      | 214 +++++++++---------
 .../workflowrunactions/predicates.go          |  22 +-
 .../web/2022-09-01/workflowruns/predicates.go |   6 +-
 .../workflowtriggerhistories/predicates.go    |   6 +-
 .../2022-09-01/workflowtriggers/predicates.go |   6 +-
 .../2022-09-01/workflowversions/predicates.go |   8 +-
 .../2023-02-01/webpubsub/predicates.go        |  52 ++---
 .../2023-04-01/monitors/predicates.go         |   6 +-
 .../providerinstances/predicates.go           |   6 +-
 .../predicates.go                             |   6 +-
 .../sapcentralinstances/predicates.go         |   6 +-
 .../sapdatabaseinstances/predicates.go        |   6 +-
 .../sapvirtualinstances/predicates.go         |   6 +-
 2175 files changed, 9679 insertions(+), 9679 deletions(-)

diff --git a/resource-manager/aad/2021-05-01/domainservices/predicates.go b/resource-manager/aad/2021-05-01/domainservices/predicates.go
index 7d6bd09731d..5ebc3819ca2 100644
--- a/resource-manager/aad/2021-05-01/domainservices/predicates.go
+++ b/resource-manager/aad/2021-05-01/domainservices/predicates.go
@@ -13,23 +13,23 @@ type DomainServiceOperationPredicate struct {
 
 func (p DomainServiceOperationPredicate) Matches(input DomainService) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/aad/2021-05-01/oucontainer/predicates.go b/resource-manager/aad/2021-05-01/oucontainer/predicates.go
index ec476bc3cf7..2365b73e5ba 100644
--- a/resource-manager/aad/2021-05-01/oucontainer/predicates.go
+++ b/resource-manager/aad/2021-05-01/oucontainer/predicates.go
@@ -13,23 +13,23 @@ type OuContainerOperationPredicate struct {
 
 func (p OuContainerOperationPredicate) Matches(input OuContainer) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/aadb2c/2021-04-01-preview/tenants/predicates.go b/resource-manager/aadb2c/2021-04-01-preview/tenants/predicates.go
index bb719822b76..cbb0e472ff6 100644
--- a/resource-manager/aadb2c/2021-04-01-preview/tenants/predicates.go
+++ b/resource-manager/aadb2c/2021-04-01-preview/tenants/predicates.go
@@ -11,15 +11,15 @@ type TenantOperationPredicate struct {
 
 func (p TenantOperationPredicate) Matches(input Tenant) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/advisor/2020-01-01/configurations/predicates.go b/resource-manager/advisor/2020-01-01/configurations/predicates.go
index 4d3b0224cb5..c91d4694b71 100644
--- a/resource-manager/advisor/2020-01-01/configurations/predicates.go
+++ b/resource-manager/advisor/2020-01-01/configurations/predicates.go
@@ -11,15 +11,15 @@ type ConfigDataOperationPredicate struct {
 
 func (p ConfigDataOperationPredicate) Matches(input ConfigData) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/advisor/2020-01-01/getrecommendations/predicates.go b/resource-manager/advisor/2020-01-01/getrecommendations/predicates.go
index 44240f9f63f..a958f48fae1 100644
--- a/resource-manager/advisor/2020-01-01/getrecommendations/predicates.go
+++ b/resource-manager/advisor/2020-01-01/getrecommendations/predicates.go
@@ -11,15 +11,15 @@ type ResourceRecommendationBaseOperationPredicate struct {
 
 func (p ResourceRecommendationBaseOperationPredicate) Matches(input ResourceRecommendationBase) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/advisor/2020-01-01/metadata/predicates.go b/resource-manager/advisor/2020-01-01/metadata/predicates.go
index 03493a7b2bb..f30d9dc7b97 100644
--- a/resource-manager/advisor/2020-01-01/metadata/predicates.go
+++ b/resource-manager/advisor/2020-01-01/metadata/predicates.go
@@ -11,15 +11,15 @@ type MetadataEntityOperationPredicate struct {
 
 func (p MetadataEntityOperationPredicate) Matches(input MetadataEntity) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/advisor/2020-01-01/suppressions/predicates.go b/resource-manager/advisor/2020-01-01/suppressions/predicates.go
index 1bf8953c9e8..4e0826acb8d 100644
--- a/resource-manager/advisor/2020-01-01/suppressions/predicates.go
+++ b/resource-manager/advisor/2020-01-01/suppressions/predicates.go
@@ -11,15 +11,15 @@ type SuppressionContractOperationPredicate struct {
 
 func (p SuppressionContractOperationPredicate) Matches(input SuppressionContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/advisor/2022-10-01/configurations/predicates.go b/resource-manager/advisor/2022-10-01/configurations/predicates.go
index 4d3b0224cb5..c91d4694b71 100644
--- a/resource-manager/advisor/2022-10-01/configurations/predicates.go
+++ b/resource-manager/advisor/2022-10-01/configurations/predicates.go
@@ -11,15 +11,15 @@ type ConfigDataOperationPredicate struct {
 
 func (p ConfigDataOperationPredicate) Matches(input ConfigData) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/advisor/2022-10-01/getrecommendations/predicates.go b/resource-manager/advisor/2022-10-01/getrecommendations/predicates.go
index 44240f9f63f..a958f48fae1 100644
--- a/resource-manager/advisor/2022-10-01/getrecommendations/predicates.go
+++ b/resource-manager/advisor/2022-10-01/getrecommendations/predicates.go
@@ -11,15 +11,15 @@ type ResourceRecommendationBaseOperationPredicate struct {
 
 func (p ResourceRecommendationBaseOperationPredicate) Matches(input ResourceRecommendationBase) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/advisor/2022-10-01/metadata/predicates.go b/resource-manager/advisor/2022-10-01/metadata/predicates.go
index 03493a7b2bb..f30d9dc7b97 100644
--- a/resource-manager/advisor/2022-10-01/metadata/predicates.go
+++ b/resource-manager/advisor/2022-10-01/metadata/predicates.go
@@ -11,15 +11,15 @@ type MetadataEntityOperationPredicate struct {
 
 func (p MetadataEntityOperationPredicate) Matches(input MetadataEntity) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/advisor/2022-10-01/suppressions/predicates.go b/resource-manager/advisor/2022-10-01/suppressions/predicates.go
index 1bf8953c9e8..4e0826acb8d 100644
--- a/resource-manager/advisor/2022-10-01/suppressions/predicates.go
+++ b/resource-manager/advisor/2022-10-01/suppressions/predicates.go
@@ -11,15 +11,15 @@ type SuppressionContractOperationPredicate struct {
 
 func (p SuppressionContractOperationPredicate) Matches(input SuppressionContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/advisor/2023-01-01/configurations/predicates.go b/resource-manager/advisor/2023-01-01/configurations/predicates.go
index 4d3b0224cb5..c91d4694b71 100644
--- a/resource-manager/advisor/2023-01-01/configurations/predicates.go
+++ b/resource-manager/advisor/2023-01-01/configurations/predicates.go
@@ -11,15 +11,15 @@ type ConfigDataOperationPredicate struct {
 
 func (p ConfigDataOperationPredicate) Matches(input ConfigData) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/advisor/2023-01-01/getrecommendations/predicates.go b/resource-manager/advisor/2023-01-01/getrecommendations/predicates.go
index 44240f9f63f..a958f48fae1 100644
--- a/resource-manager/advisor/2023-01-01/getrecommendations/predicates.go
+++ b/resource-manager/advisor/2023-01-01/getrecommendations/predicates.go
@@ -11,15 +11,15 @@ type ResourceRecommendationBaseOperationPredicate struct {
 
 func (p ResourceRecommendationBaseOperationPredicate) Matches(input ResourceRecommendationBase) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/advisor/2023-01-01/metadata/predicates.go b/resource-manager/advisor/2023-01-01/metadata/predicates.go
index 03493a7b2bb..f30d9dc7b97 100644
--- a/resource-manager/advisor/2023-01-01/metadata/predicates.go
+++ b/resource-manager/advisor/2023-01-01/metadata/predicates.go
@@ -11,15 +11,15 @@ type MetadataEntityOperationPredicate struct {
 
 func (p MetadataEntityOperationPredicate) Matches(input MetadataEntity) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/advisor/2023-01-01/suppressions/predicates.go b/resource-manager/advisor/2023-01-01/suppressions/predicates.go
index 1bf8953c9e8..4e0826acb8d 100644
--- a/resource-manager/advisor/2023-01-01/suppressions/predicates.go
+++ b/resource-manager/advisor/2023-01-01/suppressions/predicates.go
@@ -11,15 +11,15 @@ type SuppressionContractOperationPredicate struct {
 
 func (p SuppressionContractOperationPredicate) Matches(input SuppressionContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/alertsmanagement/2021-08-08/alertprocessingrules/predicates.go b/resource-manager/alertsmanagement/2021-08-08/alertprocessingrules/predicates.go
index e1acbad8d99..2d016611346 100644
--- a/resource-manager/alertsmanagement/2021-08-08/alertprocessingrules/predicates.go
+++ b/resource-manager/alertsmanagement/2021-08-08/alertprocessingrules/predicates.go
@@ -12,7 +12,7 @@ type AlertProcessingRuleOperationPredicate struct {
 
 func (p AlertProcessingRuleOperationPredicate) Matches(input AlertProcessingRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p AlertProcessingRuleOperationPredicate) Matches(input AlertProcessingRule
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/api/predicates.go b/resource-manager/apimanagement/2021-08-01/api/predicates.go
index b4daaa07daf..780e16ccd7f 100644
--- a/resource-manager/apimanagement/2021-08-01/api/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/api/predicates.go
@@ -11,15 +11,15 @@ type ApiContractOperationPredicate struct {
 
 func (p ApiContractOperationPredicate) Matches(input ApiContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/apidiagnostic/predicates.go b/resource-manager/apimanagement/2021-08-01/apidiagnostic/predicates.go
index 895502145ac..0ab615cd8e8 100644
--- a/resource-manager/apimanagement/2021-08-01/apidiagnostic/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/apidiagnostic/predicates.go
@@ -11,15 +11,15 @@ type DiagnosticContractOperationPredicate struct {
 
 func (p DiagnosticContractOperationPredicate) Matches(input DiagnosticContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/apiissue/predicates.go b/resource-manager/apimanagement/2021-08-01/apiissue/predicates.go
index 7bdc6de5036..9b2707f32ce 100644
--- a/resource-manager/apimanagement/2021-08-01/apiissue/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/apiissue/predicates.go
@@ -11,15 +11,15 @@ type IssueContractOperationPredicate struct {
 
 func (p IssueContractOperationPredicate) Matches(input IssueContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/apiissueattachment/predicates.go b/resource-manager/apimanagement/2021-08-01/apiissueattachment/predicates.go
index 525f3623393..9ad56fa6d65 100644
--- a/resource-manager/apimanagement/2021-08-01/apiissueattachment/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/apiissueattachment/predicates.go
@@ -11,15 +11,15 @@ type IssueAttachmentContractOperationPredicate struct {
 
 func (p IssueAttachmentContractOperationPredicate) Matches(input IssueAttachmentContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/apiissuecomment/predicates.go b/resource-manager/apimanagement/2021-08-01/apiissuecomment/predicates.go
index aa041d486ee..1881c0c48df 100644
--- a/resource-manager/apimanagement/2021-08-01/apiissuecomment/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/apiissuecomment/predicates.go
@@ -11,15 +11,15 @@ type IssueCommentContractOperationPredicate struct {
 
 func (p IssueCommentContractOperationPredicate) Matches(input IssueCommentContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/apimanagementservice/predicates.go b/resource-manager/apimanagement/2021-08-01/apimanagementservice/predicates.go
index 865d83001f4..0aedfbdb9df 100644
--- a/resource-manager/apimanagement/2021-08-01/apimanagementservice/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/apimanagementservice/predicates.go
@@ -13,11 +13,11 @@ type ApiManagementServiceResourceOperationPredicate struct {
 
 func (p ApiManagementServiceResourceOperationPredicate) Matches(input ApiManagementServiceResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p ApiManagementServiceResourceOperationPredicate) Matches(input ApiManagem
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/apimanagementserviceskus/predicates.go b/resource-manager/apimanagement/2021-08-01/apimanagementserviceskus/predicates.go
index 966efffefcc..7b33648a810 100644
--- a/resource-manager/apimanagement/2021-08-01/apimanagementserviceskus/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/apimanagementserviceskus/predicates.go
@@ -9,7 +9,7 @@ type ResourceSkuResultOperationPredicate struct {
 
 func (p ResourceSkuResultOperationPredicate) Matches(input ResourceSkuResult) bool {
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/apioperation/predicates.go b/resource-manager/apimanagement/2021-08-01/apioperation/predicates.go
index 9c0f063c085..80cc934a835 100644
--- a/resource-manager/apimanagement/2021-08-01/apioperation/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/apioperation/predicates.go
@@ -11,15 +11,15 @@ type OperationContractOperationPredicate struct {
 
 func (p OperationContractOperationPredicate) Matches(input OperationContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/apioperationtag/predicates.go b/resource-manager/apimanagement/2021-08-01/apioperationtag/predicates.go
index 43181b14781..84e8e1e9330 100644
--- a/resource-manager/apimanagement/2021-08-01/apioperationtag/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/apioperationtag/predicates.go
@@ -11,15 +11,15 @@ type TagContractOperationPredicate struct {
 
 func (p TagContractOperationPredicate) Matches(input TagContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/apiproduct/predicates.go b/resource-manager/apimanagement/2021-08-01/apiproduct/predicates.go
index 5238f7c6aa1..8d4210b9d4c 100644
--- a/resource-manager/apimanagement/2021-08-01/apiproduct/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/apiproduct/predicates.go
@@ -11,15 +11,15 @@ type ProductContractOperationPredicate struct {
 
 func (p ProductContractOperationPredicate) Matches(input ProductContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/apirelease/predicates.go b/resource-manager/apimanagement/2021-08-01/apirelease/predicates.go
index 65aa229c193..97527612637 100644
--- a/resource-manager/apimanagement/2021-08-01/apirelease/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/apirelease/predicates.go
@@ -11,15 +11,15 @@ type ApiReleaseContractOperationPredicate struct {
 
 func (p ApiReleaseContractOperationPredicate) Matches(input ApiReleaseContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/apirevision/predicates.go b/resource-manager/apimanagement/2021-08-01/apirevision/predicates.go
index e50fed8a56a..bd4911829a3 100644
--- a/resource-manager/apimanagement/2021-08-01/apirevision/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/apirevision/predicates.go
@@ -16,35 +16,35 @@ type ApiRevisionContractOperationPredicate struct {
 
 func (p ApiRevisionContractOperationPredicate) Matches(input ApiRevisionContract) bool {
 
-	if p.ApiId != nil && (input.ApiId == nil && *p.ApiId != *input.ApiId) {
+	if p.ApiId != nil && (input.ApiId == nil || *p.ApiId != *input.ApiId) {
 		return false
 	}
 
-	if p.ApiRevision != nil && (input.ApiRevision == nil && *p.ApiRevision != *input.ApiRevision) {
+	if p.ApiRevision != nil && (input.ApiRevision == nil || *p.ApiRevision != *input.ApiRevision) {
 		return false
 	}
 
-	if p.CreatedDateTime != nil && (input.CreatedDateTime == nil && *p.CreatedDateTime != *input.CreatedDateTime) {
+	if p.CreatedDateTime != nil && (input.CreatedDateTime == nil || *p.CreatedDateTime != *input.CreatedDateTime) {
 		return false
 	}
 
-	if p.Description != nil && (input.Description == nil && *p.Description != *input.Description) {
+	if p.Description != nil && (input.Description == nil || *p.Description != *input.Description) {
 		return false
 	}
 
-	if p.IsCurrent != nil && (input.IsCurrent == nil && *p.IsCurrent != *input.IsCurrent) {
+	if p.IsCurrent != nil && (input.IsCurrent == nil || *p.IsCurrent != *input.IsCurrent) {
 		return false
 	}
 
-	if p.IsOnline != nil && (input.IsOnline == nil && *p.IsOnline != *input.IsOnline) {
+	if p.IsOnline != nil && (input.IsOnline == nil || *p.IsOnline != *input.IsOnline) {
 		return false
 	}
 
-	if p.PrivateUrl != nil && (input.PrivateUrl == nil && *p.PrivateUrl != *input.PrivateUrl) {
+	if p.PrivateUrl != nil && (input.PrivateUrl == nil || *p.PrivateUrl != *input.PrivateUrl) {
 		return false
 	}
 
-	if p.UpdatedDateTime != nil && (input.UpdatedDateTime == nil && *p.UpdatedDateTime != *input.UpdatedDateTime) {
+	if p.UpdatedDateTime != nil && (input.UpdatedDateTime == nil || *p.UpdatedDateTime != *input.UpdatedDateTime) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/apischema/predicates.go b/resource-manager/apimanagement/2021-08-01/apischema/predicates.go
index da50ea48201..2805a46671c 100644
--- a/resource-manager/apimanagement/2021-08-01/apischema/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/apischema/predicates.go
@@ -11,15 +11,15 @@ type SchemaContractOperationPredicate struct {
 
 func (p SchemaContractOperationPredicate) Matches(input SchemaContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/apitag/predicates.go b/resource-manager/apimanagement/2021-08-01/apitag/predicates.go
index d788791435c..4123a26d885 100644
--- a/resource-manager/apimanagement/2021-08-01/apitag/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/apitag/predicates.go
@@ -11,15 +11,15 @@ type TagContractOperationPredicate struct {
 
 func (p TagContractOperationPredicate) Matches(input TagContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/apitagdescription/predicates.go b/resource-manager/apimanagement/2021-08-01/apitagdescription/predicates.go
index f86d677b62c..e42faf26df9 100644
--- a/resource-manager/apimanagement/2021-08-01/apitagdescription/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/apitagdescription/predicates.go
@@ -11,15 +11,15 @@ type TagDescriptionContractOperationPredicate struct {
 
 func (p TagDescriptionContractOperationPredicate) Matches(input TagDescriptionContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/apiversionset/predicates.go b/resource-manager/apimanagement/2021-08-01/apiversionset/predicates.go
index 86447387e62..66a673e544d 100644
--- a/resource-manager/apimanagement/2021-08-01/apiversionset/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/apiversionset/predicates.go
@@ -11,15 +11,15 @@ type ApiVersionSetContractOperationPredicate struct {
 
 func (p ApiVersionSetContractOperationPredicate) Matches(input ApiVersionSetContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/authorizationserver/predicates.go b/resource-manager/apimanagement/2021-08-01/authorizationserver/predicates.go
index 0fd658b5712..a1ec772dca9 100644
--- a/resource-manager/apimanagement/2021-08-01/authorizationserver/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/authorizationserver/predicates.go
@@ -11,15 +11,15 @@ type AuthorizationServerContractOperationPredicate struct {
 
 func (p AuthorizationServerContractOperationPredicate) Matches(input AuthorizationServerContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/backend/predicates.go b/resource-manager/apimanagement/2021-08-01/backend/predicates.go
index 79c22a7e5ea..42bc6a1a63f 100644
--- a/resource-manager/apimanagement/2021-08-01/backend/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/backend/predicates.go
@@ -11,15 +11,15 @@ type BackendContractOperationPredicate struct {
 
 func (p BackendContractOperationPredicate) Matches(input BackendContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/cache/predicates.go b/resource-manager/apimanagement/2021-08-01/cache/predicates.go
index 2cc9dbf9218..e1d595e6530 100644
--- a/resource-manager/apimanagement/2021-08-01/cache/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/cache/predicates.go
@@ -11,15 +11,15 @@ type CacheContractOperationPredicate struct {
 
 func (p CacheContractOperationPredicate) Matches(input CacheContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/certificate/predicates.go b/resource-manager/apimanagement/2021-08-01/certificate/predicates.go
index 10666278e74..62350ffb8a7 100644
--- a/resource-manager/apimanagement/2021-08-01/certificate/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/certificate/predicates.go
@@ -11,15 +11,15 @@ type CertificateContractOperationPredicate struct {
 
 func (p CertificateContractOperationPredicate) Matches(input CertificateContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/contenttype/predicates.go b/resource-manager/apimanagement/2021-08-01/contenttype/predicates.go
index 0183a90443b..a2af0a3d264 100644
--- a/resource-manager/apimanagement/2021-08-01/contenttype/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/contenttype/predicates.go
@@ -11,15 +11,15 @@ type ContentTypeContractOperationPredicate struct {
 
 func (p ContentTypeContractOperationPredicate) Matches(input ContentTypeContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/contenttypecontentitem/predicates.go b/resource-manager/apimanagement/2021-08-01/contenttypecontentitem/predicates.go
index 4aa4853bc43..4fe5ffb1fe9 100644
--- a/resource-manager/apimanagement/2021-08-01/contenttypecontentitem/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/contenttypecontentitem/predicates.go
@@ -12,19 +12,19 @@ type ContentItemContractOperationPredicate struct {
 
 func (p ContentItemContractOperationPredicate) Matches(input ContentItemContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Properties != nil && (input.Properties == nil && *p.Properties != *input.Properties) {
+	if p.Properties != nil && (input.Properties == nil || *p.Properties != *input.Properties) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/deletedservice/predicates.go b/resource-manager/apimanagement/2021-08-01/deletedservice/predicates.go
index 9680e30497a..54bf3b119fb 100644
--- a/resource-manager/apimanagement/2021-08-01/deletedservice/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/deletedservice/predicates.go
@@ -12,19 +12,19 @@ type DeletedServiceContractOperationPredicate struct {
 
 func (p DeletedServiceContractOperationPredicate) Matches(input DeletedServiceContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/diagnostic/predicates.go b/resource-manager/apimanagement/2021-08-01/diagnostic/predicates.go
index ab620b48461..1a3641637d2 100644
--- a/resource-manager/apimanagement/2021-08-01/diagnostic/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/diagnostic/predicates.go
@@ -11,15 +11,15 @@ type DiagnosticContractOperationPredicate struct {
 
 func (p DiagnosticContractOperationPredicate) Matches(input DiagnosticContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/emailtemplate/predicates.go b/resource-manager/apimanagement/2021-08-01/emailtemplate/predicates.go
index 0d9d323e51b..9a8a270e788 100644
--- a/resource-manager/apimanagement/2021-08-01/emailtemplate/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/emailtemplate/predicates.go
@@ -11,15 +11,15 @@ type EmailTemplateContractOperationPredicate struct {
 
 func (p EmailTemplateContractOperationPredicate) Matches(input EmailTemplateContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/gateway/predicates.go b/resource-manager/apimanagement/2021-08-01/gateway/predicates.go
index 6a483a0683f..e3df21dd4c0 100644
--- a/resource-manager/apimanagement/2021-08-01/gateway/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/gateway/predicates.go
@@ -11,15 +11,15 @@ type GatewayContractOperationPredicate struct {
 
 func (p GatewayContractOperationPredicate) Matches(input GatewayContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/gatewayapi/predicates.go b/resource-manager/apimanagement/2021-08-01/gatewayapi/predicates.go
index afe855d4db9..46947f21478 100644
--- a/resource-manager/apimanagement/2021-08-01/gatewayapi/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/gatewayapi/predicates.go
@@ -11,15 +11,15 @@ type ApiContractOperationPredicate struct {
 
 func (p ApiContractOperationPredicate) Matches(input ApiContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/gatewaycertificateauthority/predicates.go b/resource-manager/apimanagement/2021-08-01/gatewaycertificateauthority/predicates.go
index 1f1f4058d32..10927ccab9f 100644
--- a/resource-manager/apimanagement/2021-08-01/gatewaycertificateauthority/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/gatewaycertificateauthority/predicates.go
@@ -11,15 +11,15 @@ type GatewayCertificateAuthorityContractOperationPredicate struct {
 
 func (p GatewayCertificateAuthorityContractOperationPredicate) Matches(input GatewayCertificateAuthorityContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/gatewayhostnameconfiguration/predicates.go b/resource-manager/apimanagement/2021-08-01/gatewayhostnameconfiguration/predicates.go
index c595878e338..737fbb773b4 100644
--- a/resource-manager/apimanagement/2021-08-01/gatewayhostnameconfiguration/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/gatewayhostnameconfiguration/predicates.go
@@ -11,15 +11,15 @@ type GatewayHostnameConfigurationContractOperationPredicate struct {
 
 func (p GatewayHostnameConfigurationContractOperationPredicate) Matches(input GatewayHostnameConfigurationContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/group/predicates.go b/resource-manager/apimanagement/2021-08-01/group/predicates.go
index 5a7c61a2911..c6031629295 100644
--- a/resource-manager/apimanagement/2021-08-01/group/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/group/predicates.go
@@ -11,15 +11,15 @@ type GroupContractOperationPredicate struct {
 
 func (p GroupContractOperationPredicate) Matches(input GroupContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/groupuser/predicates.go b/resource-manager/apimanagement/2021-08-01/groupuser/predicates.go
index 04011097569..c2691a6325d 100644
--- a/resource-manager/apimanagement/2021-08-01/groupuser/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/groupuser/predicates.go
@@ -11,15 +11,15 @@ type UserContractOperationPredicate struct {
 
 func (p UserContractOperationPredicate) Matches(input UserContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/identityprovider/predicates.go b/resource-manager/apimanagement/2021-08-01/identityprovider/predicates.go
index 50f3efc320c..106538ef5e6 100644
--- a/resource-manager/apimanagement/2021-08-01/identityprovider/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/identityprovider/predicates.go
@@ -11,15 +11,15 @@ type IdentityProviderContractOperationPredicate struct {
 
 func (p IdentityProviderContractOperationPredicate) Matches(input IdentityProviderContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/issue/predicates.go b/resource-manager/apimanagement/2021-08-01/issue/predicates.go
index 96bca9022aa..f0a8d6f81ad 100644
--- a/resource-manager/apimanagement/2021-08-01/issue/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/issue/predicates.go
@@ -11,15 +11,15 @@ type IssueContractOperationPredicate struct {
 
 func (p IssueContractOperationPredicate) Matches(input IssueContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/logger/predicates.go b/resource-manager/apimanagement/2021-08-01/logger/predicates.go
index d3a61c2fb22..9dfff89de12 100644
--- a/resource-manager/apimanagement/2021-08-01/logger/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/logger/predicates.go
@@ -11,15 +11,15 @@ type LoggerContractOperationPredicate struct {
 
 func (p LoggerContractOperationPredicate) Matches(input LoggerContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/namedvalue/predicates.go b/resource-manager/apimanagement/2021-08-01/namedvalue/predicates.go
index 841c06f9515..7bffc82f9da 100644
--- a/resource-manager/apimanagement/2021-08-01/namedvalue/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/namedvalue/predicates.go
@@ -11,15 +11,15 @@ type NamedValueContractOperationPredicate struct {
 
 func (p NamedValueContractOperationPredicate) Matches(input NamedValueContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/notification/predicates.go b/resource-manager/apimanagement/2021-08-01/notification/predicates.go
index 90cccc3650c..7235194fc77 100644
--- a/resource-manager/apimanagement/2021-08-01/notification/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/notification/predicates.go
@@ -11,15 +11,15 @@ type NotificationContractOperationPredicate struct {
 
 func (p NotificationContractOperationPredicate) Matches(input NotificationContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/openidconnectprovider/predicates.go b/resource-manager/apimanagement/2021-08-01/openidconnectprovider/predicates.go
index 808564b7082..9a85ff23a16 100644
--- a/resource-manager/apimanagement/2021-08-01/openidconnectprovider/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/openidconnectprovider/predicates.go
@@ -11,15 +11,15 @@ type OpenidConnectProviderContractOperationPredicate struct {
 
 func (p OpenidConnectProviderContractOperationPredicate) Matches(input OpenidConnectProviderContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/portalrevision/predicates.go b/resource-manager/apimanagement/2021-08-01/portalrevision/predicates.go
index b091c77b834..fa276f0afc0 100644
--- a/resource-manager/apimanagement/2021-08-01/portalrevision/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/portalrevision/predicates.go
@@ -11,15 +11,15 @@ type PortalRevisionContractOperationPredicate struct {
 
 func (p PortalRevisionContractOperationPredicate) Matches(input PortalRevisionContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/product/predicates.go b/resource-manager/apimanagement/2021-08-01/product/predicates.go
index b9946328368..7e24e47c6fc 100644
--- a/resource-manager/apimanagement/2021-08-01/product/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/product/predicates.go
@@ -11,15 +11,15 @@ type ProductContractOperationPredicate struct {
 
 func (p ProductContractOperationPredicate) Matches(input ProductContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/productapi/predicates.go b/resource-manager/apimanagement/2021-08-01/productapi/predicates.go
index 1884618978c..291c7d4c7b5 100644
--- a/resource-manager/apimanagement/2021-08-01/productapi/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/productapi/predicates.go
@@ -11,15 +11,15 @@ type ApiContractOperationPredicate struct {
 
 func (p ApiContractOperationPredicate) Matches(input ApiContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/productgroup/predicates.go b/resource-manager/apimanagement/2021-08-01/productgroup/predicates.go
index 8dea18d8f9e..6d25db13cf9 100644
--- a/resource-manager/apimanagement/2021-08-01/productgroup/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/productgroup/predicates.go
@@ -11,15 +11,15 @@ type GroupContractOperationPredicate struct {
 
 func (p GroupContractOperationPredicate) Matches(input GroupContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/productsubscription/predicates.go b/resource-manager/apimanagement/2021-08-01/productsubscription/predicates.go
index 0ab50d385f2..66c5b3fd316 100644
--- a/resource-manager/apimanagement/2021-08-01/productsubscription/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/productsubscription/predicates.go
@@ -11,15 +11,15 @@ type SubscriptionContractOperationPredicate struct {
 
 func (p SubscriptionContractOperationPredicate) Matches(input SubscriptionContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/producttag/predicates.go b/resource-manager/apimanagement/2021-08-01/producttag/predicates.go
index 8c8ae7d1318..cc40ebaa06a 100644
--- a/resource-manager/apimanagement/2021-08-01/producttag/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/producttag/predicates.go
@@ -11,15 +11,15 @@ type TagContractOperationPredicate struct {
 
 func (p TagContractOperationPredicate) Matches(input TagContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/region/predicates.go b/resource-manager/apimanagement/2021-08-01/region/predicates.go
index 49b61b040fc..30ed56319df 100644
--- a/resource-manager/apimanagement/2021-08-01/region/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/region/predicates.go
@@ -11,15 +11,15 @@ type RegionContractOperationPredicate struct {
 
 func (p RegionContractOperationPredicate) Matches(input RegionContract) bool {
 
-	if p.IsDeleted != nil && (input.IsDeleted == nil && *p.IsDeleted != *input.IsDeleted) {
+	if p.IsDeleted != nil && (input.IsDeleted == nil || *p.IsDeleted != *input.IsDeleted) {
 		return false
 	}
 
-	if p.IsMasterRegion != nil && (input.IsMasterRegion == nil && *p.IsMasterRegion != *input.IsMasterRegion) {
+	if p.IsMasterRegion != nil && (input.IsMasterRegion == nil || *p.IsMasterRegion != *input.IsMasterRegion) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/reports/predicates.go b/resource-manager/apimanagement/2021-08-01/reports/predicates.go
index 9cb1ebcfe61..752c5ee660a 100644
--- a/resource-manager/apimanagement/2021-08-01/reports/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/reports/predicates.go
@@ -34,107 +34,107 @@ type ReportRecordContractOperationPredicate struct {
 
 func (p ReportRecordContractOperationPredicate) Matches(input ReportRecordContract) bool {
 
-	if p.ApiId != nil && (input.ApiId == nil && *p.ApiId != *input.ApiId) {
+	if p.ApiId != nil && (input.ApiId == nil || *p.ApiId != *input.ApiId) {
 		return false
 	}
 
-	if p.ApiRegion != nil && (input.ApiRegion == nil && *p.ApiRegion != *input.ApiRegion) {
+	if p.ApiRegion != nil && (input.ApiRegion == nil || *p.ApiRegion != *input.ApiRegion) {
 		return false
 	}
 
-	if p.ApiTimeAvg != nil && (input.ApiTimeAvg == nil && *p.ApiTimeAvg != *input.ApiTimeAvg) {
+	if p.ApiTimeAvg != nil && (input.ApiTimeAvg == nil || *p.ApiTimeAvg != *input.ApiTimeAvg) {
 		return false
 	}
 
-	if p.ApiTimeMax != nil && (input.ApiTimeMax == nil && *p.ApiTimeMax != *input.ApiTimeMax) {
+	if p.ApiTimeMax != nil && (input.ApiTimeMax == nil || *p.ApiTimeMax != *input.ApiTimeMax) {
 		return false
 	}
 
-	if p.ApiTimeMin != nil && (input.ApiTimeMin == nil && *p.ApiTimeMin != *input.ApiTimeMin) {
+	if p.ApiTimeMin != nil && (input.ApiTimeMin == nil || *p.ApiTimeMin != *input.ApiTimeMin) {
 		return false
 	}
 
-	if p.Bandwidth != nil && (input.Bandwidth == nil && *p.Bandwidth != *input.Bandwidth) {
+	if p.Bandwidth != nil && (input.Bandwidth == nil || *p.Bandwidth != *input.Bandwidth) {
 		return false
 	}
 
-	if p.CacheHitCount != nil && (input.CacheHitCount == nil && *p.CacheHitCount != *input.CacheHitCount) {
+	if p.CacheHitCount != nil && (input.CacheHitCount == nil || *p.CacheHitCount != *input.CacheHitCount) {
 		return false
 	}
 
-	if p.CacheMissCount != nil && (input.CacheMissCount == nil && *p.CacheMissCount != *input.CacheMissCount) {
+	if p.CacheMissCount != nil && (input.CacheMissCount == nil || *p.CacheMissCount != *input.CacheMissCount) {
 		return false
 	}
 
-	if p.CallCountBlocked != nil && (input.CallCountBlocked == nil && *p.CallCountBlocked != *input.CallCountBlocked) {
+	if p.CallCountBlocked != nil && (input.CallCountBlocked == nil || *p.CallCountBlocked != *input.CallCountBlocked) {
 		return false
 	}
 
-	if p.CallCountFailed != nil && (input.CallCountFailed == nil && *p.CallCountFailed != *input.CallCountFailed) {
+	if p.CallCountFailed != nil && (input.CallCountFailed == nil || *p.CallCountFailed != *input.CallCountFailed) {
 		return false
 	}
 
-	if p.CallCountOther != nil && (input.CallCountOther == nil && *p.CallCountOther != *input.CallCountOther) {
+	if p.CallCountOther != nil && (input.CallCountOther == nil || *p.CallCountOther != *input.CallCountOther) {
 		return false
 	}
 
-	if p.CallCountSuccess != nil && (input.CallCountSuccess == nil && *p.CallCountSuccess != *input.CallCountSuccess) {
+	if p.CallCountSuccess != nil && (input.CallCountSuccess == nil || *p.CallCountSuccess != *input.CallCountSuccess) {
 		return false
 	}
 
-	if p.CallCountTotal != nil && (input.CallCountTotal == nil && *p.CallCountTotal != *input.CallCountTotal) {
+	if p.CallCountTotal != nil && (input.CallCountTotal == nil || *p.CallCountTotal != *input.CallCountTotal) {
 		return false
 	}
 
-	if p.Country != nil && (input.Country == nil && *p.Country != *input.Country) {
+	if p.Country != nil && (input.Country == nil || *p.Country != *input.Country) {
 		return false
 	}
 
-	if p.Interval != nil && (input.Interval == nil && *p.Interval != *input.Interval) {
+	if p.Interval != nil && (input.Interval == nil || *p.Interval != *input.Interval) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.OperationId != nil && (input.OperationId == nil && *p.OperationId != *input.OperationId) {
+	if p.OperationId != nil && (input.OperationId == nil || *p.OperationId != *input.OperationId) {
 		return false
 	}
 
-	if p.ProductId != nil && (input.ProductId == nil && *p.ProductId != *input.ProductId) {
+	if p.ProductId != nil && (input.ProductId == nil || *p.ProductId != *input.ProductId) {
 		return false
 	}
 
-	if p.Region != nil && (input.Region == nil && *p.Region != *input.Region) {
+	if p.Region != nil && (input.Region == nil || *p.Region != *input.Region) {
 		return false
 	}
 
-	if p.ServiceTimeAvg != nil && (input.ServiceTimeAvg == nil && *p.ServiceTimeAvg != *input.ServiceTimeAvg) {
+	if p.ServiceTimeAvg != nil && (input.ServiceTimeAvg == nil || *p.ServiceTimeAvg != *input.ServiceTimeAvg) {
 		return false
 	}
 
-	if p.ServiceTimeMax != nil && (input.ServiceTimeMax == nil && *p.ServiceTimeMax != *input.ServiceTimeMax) {
+	if p.ServiceTimeMax != nil && (input.ServiceTimeMax == nil || *p.ServiceTimeMax != *input.ServiceTimeMax) {
 		return false
 	}
 
-	if p.ServiceTimeMin != nil && (input.ServiceTimeMin == nil && *p.ServiceTimeMin != *input.ServiceTimeMin) {
+	if p.ServiceTimeMin != nil && (input.ServiceTimeMin == nil || *p.ServiceTimeMin != *input.ServiceTimeMin) {
 		return false
 	}
 
-	if p.SubscriptionId != nil && (input.SubscriptionId == nil && *p.SubscriptionId != *input.SubscriptionId) {
+	if p.SubscriptionId != nil && (input.SubscriptionId == nil || *p.SubscriptionId != *input.SubscriptionId) {
 		return false
 	}
 
-	if p.Timestamp != nil && (input.Timestamp == nil && *p.Timestamp != *input.Timestamp) {
+	if p.Timestamp != nil && (input.Timestamp == nil || *p.Timestamp != *input.Timestamp) {
 		return false
 	}
 
-	if p.UserId != nil && (input.UserId == nil && *p.UserId != *input.UserId) {
+	if p.UserId != nil && (input.UserId == nil || *p.UserId != *input.UserId) {
 		return false
 	}
 
-	if p.Zip != nil && (input.Zip == nil && *p.Zip != *input.Zip) {
+	if p.Zip != nil && (input.Zip == nil || *p.Zip != *input.Zip) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/schema/predicates.go b/resource-manager/apimanagement/2021-08-01/schema/predicates.go
index c08f263d9bf..7f16ac143ee 100644
--- a/resource-manager/apimanagement/2021-08-01/schema/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/schema/predicates.go
@@ -11,15 +11,15 @@ type GlobalSchemaContractOperationPredicate struct {
 
 func (p GlobalSchemaContractOperationPredicate) Matches(input GlobalSchemaContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/skus/predicates.go b/resource-manager/apimanagement/2021-08-01/skus/predicates.go
index d9163da2378..76a27562558 100644
--- a/resource-manager/apimanagement/2021-08-01/skus/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/skus/predicates.go
@@ -14,27 +14,27 @@ type ApiManagementSkuOperationPredicate struct {
 
 func (p ApiManagementSkuOperationPredicate) Matches(input ApiManagementSku) bool {
 
-	if p.Family != nil && (input.Family == nil && *p.Family != *input.Family) {
+	if p.Family != nil && (input.Family == nil || *p.Family != *input.Family) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
-	if p.Size != nil && (input.Size == nil && *p.Size != *input.Size) {
+	if p.Size != nil && (input.Size == nil || *p.Size != *input.Size) {
 		return false
 	}
 
-	if p.Tier != nil && (input.Tier == nil && *p.Tier != *input.Tier) {
+	if p.Tier != nil && (input.Tier == nil || *p.Tier != *input.Tier) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/subscription/predicates.go b/resource-manager/apimanagement/2021-08-01/subscription/predicates.go
index 72dda71bb68..71fb75412ad 100644
--- a/resource-manager/apimanagement/2021-08-01/subscription/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/subscription/predicates.go
@@ -11,15 +11,15 @@ type SubscriptionContractOperationPredicate struct {
 
 func (p SubscriptionContractOperationPredicate) Matches(input SubscriptionContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/tag/predicates.go b/resource-manager/apimanagement/2021-08-01/tag/predicates.go
index f31ec0ecc97..b05086d88d1 100644
--- a/resource-manager/apimanagement/2021-08-01/tag/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/tag/predicates.go
@@ -11,15 +11,15 @@ type TagContractOperationPredicate struct {
 
 func (p TagContractOperationPredicate) Matches(input TagContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/tenantaccess/predicates.go b/resource-manager/apimanagement/2021-08-01/tenantaccess/predicates.go
index ec5649fa53d..309dabec476 100644
--- a/resource-manager/apimanagement/2021-08-01/tenantaccess/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/tenantaccess/predicates.go
@@ -11,15 +11,15 @@ type AccessInformationContractOperationPredicate struct {
 
 func (p AccessInformationContractOperationPredicate) Matches(input AccessInformationContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/tenantsettings/predicates.go b/resource-manager/apimanagement/2021-08-01/tenantsettings/predicates.go
index f50bc92f64d..6cba8bfd733 100644
--- a/resource-manager/apimanagement/2021-08-01/tenantsettings/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/tenantsettings/predicates.go
@@ -11,15 +11,15 @@ type TenantSettingsContractOperationPredicate struct {
 
 func (p TenantSettingsContractOperationPredicate) Matches(input TenantSettingsContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/user/predicates.go b/resource-manager/apimanagement/2021-08-01/user/predicates.go
index 160c4aa77d8..70f897ed2a9 100644
--- a/resource-manager/apimanagement/2021-08-01/user/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/user/predicates.go
@@ -11,15 +11,15 @@ type UserContractOperationPredicate struct {
 
 func (p UserContractOperationPredicate) Matches(input UserContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/usergroup/predicates.go b/resource-manager/apimanagement/2021-08-01/usergroup/predicates.go
index 67e02a6c2be..b8c0bb39d17 100644
--- a/resource-manager/apimanagement/2021-08-01/usergroup/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/usergroup/predicates.go
@@ -11,15 +11,15 @@ type GroupContractOperationPredicate struct {
 
 func (p GroupContractOperationPredicate) Matches(input GroupContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/useridentity/predicates.go b/resource-manager/apimanagement/2021-08-01/useridentity/predicates.go
index fb5557934b8..a706d5676ec 100644
--- a/resource-manager/apimanagement/2021-08-01/useridentity/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/useridentity/predicates.go
@@ -10,11 +10,11 @@ type UserIdentityContractOperationPredicate struct {
 
 func (p UserIdentityContractOperationPredicate) Matches(input UserIdentityContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Provider != nil && (input.Provider == nil && *p.Provider != *input.Provider) {
+	if p.Provider != nil && (input.Provider == nil || *p.Provider != *input.Provider) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2021-08-01/usersubscription/predicates.go b/resource-manager/apimanagement/2021-08-01/usersubscription/predicates.go
index e38802fc39c..9b6a14afde7 100644
--- a/resource-manager/apimanagement/2021-08-01/usersubscription/predicates.go
+++ b/resource-manager/apimanagement/2021-08-01/usersubscription/predicates.go
@@ -11,15 +11,15 @@ type SubscriptionContractOperationPredicate struct {
 
 func (p SubscriptionContractOperationPredicate) Matches(input SubscriptionContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/api/predicates.go b/resource-manager/apimanagement/2022-08-01/api/predicates.go
index b4daaa07daf..780e16ccd7f 100644
--- a/resource-manager/apimanagement/2022-08-01/api/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/api/predicates.go
@@ -11,15 +11,15 @@ type ApiContractOperationPredicate struct {
 
 func (p ApiContractOperationPredicate) Matches(input ApiContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/apidiagnostic/predicates.go b/resource-manager/apimanagement/2022-08-01/apidiagnostic/predicates.go
index 895502145ac..0ab615cd8e8 100644
--- a/resource-manager/apimanagement/2022-08-01/apidiagnostic/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/apidiagnostic/predicates.go
@@ -11,15 +11,15 @@ type DiagnosticContractOperationPredicate struct {
 
 func (p DiagnosticContractOperationPredicate) Matches(input DiagnosticContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/apiissue/predicates.go b/resource-manager/apimanagement/2022-08-01/apiissue/predicates.go
index 7bdc6de5036..9b2707f32ce 100644
--- a/resource-manager/apimanagement/2022-08-01/apiissue/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/apiissue/predicates.go
@@ -11,15 +11,15 @@ type IssueContractOperationPredicate struct {
 
 func (p IssueContractOperationPredicate) Matches(input IssueContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/apiissueattachment/predicates.go b/resource-manager/apimanagement/2022-08-01/apiissueattachment/predicates.go
index 525f3623393..9ad56fa6d65 100644
--- a/resource-manager/apimanagement/2022-08-01/apiissueattachment/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/apiissueattachment/predicates.go
@@ -11,15 +11,15 @@ type IssueAttachmentContractOperationPredicate struct {
 
 func (p IssueAttachmentContractOperationPredicate) Matches(input IssueAttachmentContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/apiissuecomment/predicates.go b/resource-manager/apimanagement/2022-08-01/apiissuecomment/predicates.go
index aa041d486ee..1881c0c48df 100644
--- a/resource-manager/apimanagement/2022-08-01/apiissuecomment/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/apiissuecomment/predicates.go
@@ -11,15 +11,15 @@ type IssueCommentContractOperationPredicate struct {
 
 func (p IssueCommentContractOperationPredicate) Matches(input IssueCommentContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/apimanagementservice/predicates.go b/resource-manager/apimanagement/2022-08-01/apimanagementservice/predicates.go
index 865d83001f4..0aedfbdb9df 100644
--- a/resource-manager/apimanagement/2022-08-01/apimanagementservice/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/apimanagementservice/predicates.go
@@ -13,11 +13,11 @@ type ApiManagementServiceResourceOperationPredicate struct {
 
 func (p ApiManagementServiceResourceOperationPredicate) Matches(input ApiManagementServiceResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p ApiManagementServiceResourceOperationPredicate) Matches(input ApiManagem
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/apimanagementserviceskus/predicates.go b/resource-manager/apimanagement/2022-08-01/apimanagementserviceskus/predicates.go
index 966efffefcc..7b33648a810 100644
--- a/resource-manager/apimanagement/2022-08-01/apimanagementserviceskus/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/apimanagementserviceskus/predicates.go
@@ -9,7 +9,7 @@ type ResourceSkuResultOperationPredicate struct {
 
 func (p ResourceSkuResultOperationPredicate) Matches(input ResourceSkuResult) bool {
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/apioperation/predicates.go b/resource-manager/apimanagement/2022-08-01/apioperation/predicates.go
index 9c0f063c085..80cc934a835 100644
--- a/resource-manager/apimanagement/2022-08-01/apioperation/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/apioperation/predicates.go
@@ -11,15 +11,15 @@ type OperationContractOperationPredicate struct {
 
 func (p OperationContractOperationPredicate) Matches(input OperationContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/apioperationtag/predicates.go b/resource-manager/apimanagement/2022-08-01/apioperationtag/predicates.go
index 43181b14781..84e8e1e9330 100644
--- a/resource-manager/apimanagement/2022-08-01/apioperationtag/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/apioperationtag/predicates.go
@@ -11,15 +11,15 @@ type TagContractOperationPredicate struct {
 
 func (p TagContractOperationPredicate) Matches(input TagContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/apiproduct/predicates.go b/resource-manager/apimanagement/2022-08-01/apiproduct/predicates.go
index 5238f7c6aa1..8d4210b9d4c 100644
--- a/resource-manager/apimanagement/2022-08-01/apiproduct/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/apiproduct/predicates.go
@@ -11,15 +11,15 @@ type ProductContractOperationPredicate struct {
 
 func (p ProductContractOperationPredicate) Matches(input ProductContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/apirelease/predicates.go b/resource-manager/apimanagement/2022-08-01/apirelease/predicates.go
index 65aa229c193..97527612637 100644
--- a/resource-manager/apimanagement/2022-08-01/apirelease/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/apirelease/predicates.go
@@ -11,15 +11,15 @@ type ApiReleaseContractOperationPredicate struct {
 
 func (p ApiReleaseContractOperationPredicate) Matches(input ApiReleaseContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/apirevision/predicates.go b/resource-manager/apimanagement/2022-08-01/apirevision/predicates.go
index e50fed8a56a..bd4911829a3 100644
--- a/resource-manager/apimanagement/2022-08-01/apirevision/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/apirevision/predicates.go
@@ -16,35 +16,35 @@ type ApiRevisionContractOperationPredicate struct {
 
 func (p ApiRevisionContractOperationPredicate) Matches(input ApiRevisionContract) bool {
 
-	if p.ApiId != nil && (input.ApiId == nil && *p.ApiId != *input.ApiId) {
+	if p.ApiId != nil && (input.ApiId == nil || *p.ApiId != *input.ApiId) {
 		return false
 	}
 
-	if p.ApiRevision != nil && (input.ApiRevision == nil && *p.ApiRevision != *input.ApiRevision) {
+	if p.ApiRevision != nil && (input.ApiRevision == nil || *p.ApiRevision != *input.ApiRevision) {
 		return false
 	}
 
-	if p.CreatedDateTime != nil && (input.CreatedDateTime == nil && *p.CreatedDateTime != *input.CreatedDateTime) {
+	if p.CreatedDateTime != nil && (input.CreatedDateTime == nil || *p.CreatedDateTime != *input.CreatedDateTime) {
 		return false
 	}
 
-	if p.Description != nil && (input.Description == nil && *p.Description != *input.Description) {
+	if p.Description != nil && (input.Description == nil || *p.Description != *input.Description) {
 		return false
 	}
 
-	if p.IsCurrent != nil && (input.IsCurrent == nil && *p.IsCurrent != *input.IsCurrent) {
+	if p.IsCurrent != nil && (input.IsCurrent == nil || *p.IsCurrent != *input.IsCurrent) {
 		return false
 	}
 
-	if p.IsOnline != nil && (input.IsOnline == nil && *p.IsOnline != *input.IsOnline) {
+	if p.IsOnline != nil && (input.IsOnline == nil || *p.IsOnline != *input.IsOnline) {
 		return false
 	}
 
-	if p.PrivateUrl != nil && (input.PrivateUrl == nil && *p.PrivateUrl != *input.PrivateUrl) {
+	if p.PrivateUrl != nil && (input.PrivateUrl == nil || *p.PrivateUrl != *input.PrivateUrl) {
 		return false
 	}
 
-	if p.UpdatedDateTime != nil && (input.UpdatedDateTime == nil && *p.UpdatedDateTime != *input.UpdatedDateTime) {
+	if p.UpdatedDateTime != nil && (input.UpdatedDateTime == nil || *p.UpdatedDateTime != *input.UpdatedDateTime) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/apischema/predicates.go b/resource-manager/apimanagement/2022-08-01/apischema/predicates.go
index da50ea48201..2805a46671c 100644
--- a/resource-manager/apimanagement/2022-08-01/apischema/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/apischema/predicates.go
@@ -11,15 +11,15 @@ type SchemaContractOperationPredicate struct {
 
 func (p SchemaContractOperationPredicate) Matches(input SchemaContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/apitag/predicates.go b/resource-manager/apimanagement/2022-08-01/apitag/predicates.go
index d788791435c..4123a26d885 100644
--- a/resource-manager/apimanagement/2022-08-01/apitag/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/apitag/predicates.go
@@ -11,15 +11,15 @@ type TagContractOperationPredicate struct {
 
 func (p TagContractOperationPredicate) Matches(input TagContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/apitagdescription/predicates.go b/resource-manager/apimanagement/2022-08-01/apitagdescription/predicates.go
index f86d677b62c..e42faf26df9 100644
--- a/resource-manager/apimanagement/2022-08-01/apitagdescription/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/apitagdescription/predicates.go
@@ -11,15 +11,15 @@ type TagDescriptionContractOperationPredicate struct {
 
 func (p TagDescriptionContractOperationPredicate) Matches(input TagDescriptionContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/apiversionset/predicates.go b/resource-manager/apimanagement/2022-08-01/apiversionset/predicates.go
index 86447387e62..66a673e544d 100644
--- a/resource-manager/apimanagement/2022-08-01/apiversionset/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/apiversionset/predicates.go
@@ -11,15 +11,15 @@ type ApiVersionSetContractOperationPredicate struct {
 
 func (p ApiVersionSetContractOperationPredicate) Matches(input ApiVersionSetContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/apiwiki/predicates.go b/resource-manager/apimanagement/2022-08-01/apiwiki/predicates.go
index fa4e4b8b0e0..7aec66dc170 100644
--- a/resource-manager/apimanagement/2022-08-01/apiwiki/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/apiwiki/predicates.go
@@ -11,15 +11,15 @@ type WikiContractOperationPredicate struct {
 
 func (p WikiContractOperationPredicate) Matches(input WikiContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/authorizationaccesspolicy/predicates.go b/resource-manager/apimanagement/2022-08-01/authorizationaccesspolicy/predicates.go
index a35191b802d..cd99b4e1f57 100644
--- a/resource-manager/apimanagement/2022-08-01/authorizationaccesspolicy/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/authorizationaccesspolicy/predicates.go
@@ -11,15 +11,15 @@ type AuthorizationAccessPolicyContractOperationPredicate struct {
 
 func (p AuthorizationAccessPolicyContractOperationPredicate) Matches(input AuthorizationAccessPolicyContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/authorizationprovider/predicates.go b/resource-manager/apimanagement/2022-08-01/authorizationprovider/predicates.go
index 77df35a2c9a..738fcd74173 100644
--- a/resource-manager/apimanagement/2022-08-01/authorizationprovider/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/authorizationprovider/predicates.go
@@ -11,15 +11,15 @@ type AuthorizationProviderContractOperationPredicate struct {
 
 func (p AuthorizationProviderContractOperationPredicate) Matches(input AuthorizationProviderContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/authorizations/predicates.go b/resource-manager/apimanagement/2022-08-01/authorizations/predicates.go
index 608766c8de6..cc96b1d2dc4 100644
--- a/resource-manager/apimanagement/2022-08-01/authorizations/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/authorizations/predicates.go
@@ -11,15 +11,15 @@ type AuthorizationContractOperationPredicate struct {
 
 func (p AuthorizationContractOperationPredicate) Matches(input AuthorizationContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/authorizationserver/predicates.go b/resource-manager/apimanagement/2022-08-01/authorizationserver/predicates.go
index 0fd658b5712..a1ec772dca9 100644
--- a/resource-manager/apimanagement/2022-08-01/authorizationserver/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/authorizationserver/predicates.go
@@ -11,15 +11,15 @@ type AuthorizationServerContractOperationPredicate struct {
 
 func (p AuthorizationServerContractOperationPredicate) Matches(input AuthorizationServerContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/backend/predicates.go b/resource-manager/apimanagement/2022-08-01/backend/predicates.go
index 79c22a7e5ea..42bc6a1a63f 100644
--- a/resource-manager/apimanagement/2022-08-01/backend/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/backend/predicates.go
@@ -11,15 +11,15 @@ type BackendContractOperationPredicate struct {
 
 func (p BackendContractOperationPredicate) Matches(input BackendContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/cache/predicates.go b/resource-manager/apimanagement/2022-08-01/cache/predicates.go
index 2cc9dbf9218..e1d595e6530 100644
--- a/resource-manager/apimanagement/2022-08-01/cache/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/cache/predicates.go
@@ -11,15 +11,15 @@ type CacheContractOperationPredicate struct {
 
 func (p CacheContractOperationPredicate) Matches(input CacheContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/certificate/predicates.go b/resource-manager/apimanagement/2022-08-01/certificate/predicates.go
index 10666278e74..62350ffb8a7 100644
--- a/resource-manager/apimanagement/2022-08-01/certificate/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/certificate/predicates.go
@@ -11,15 +11,15 @@ type CertificateContractOperationPredicate struct {
 
 func (p CertificateContractOperationPredicate) Matches(input CertificateContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/contenttype/predicates.go b/resource-manager/apimanagement/2022-08-01/contenttype/predicates.go
index 0183a90443b..a2af0a3d264 100644
--- a/resource-manager/apimanagement/2022-08-01/contenttype/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/contenttype/predicates.go
@@ -11,15 +11,15 @@ type ContentTypeContractOperationPredicate struct {
 
 func (p ContentTypeContractOperationPredicate) Matches(input ContentTypeContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/contenttypecontentitem/predicates.go b/resource-manager/apimanagement/2022-08-01/contenttypecontentitem/predicates.go
index 4aa4853bc43..4fe5ffb1fe9 100644
--- a/resource-manager/apimanagement/2022-08-01/contenttypecontentitem/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/contenttypecontentitem/predicates.go
@@ -12,19 +12,19 @@ type ContentItemContractOperationPredicate struct {
 
 func (p ContentItemContractOperationPredicate) Matches(input ContentItemContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Properties != nil && (input.Properties == nil && *p.Properties != *input.Properties) {
+	if p.Properties != nil && (input.Properties == nil || *p.Properties != *input.Properties) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/deletedservice/predicates.go b/resource-manager/apimanagement/2022-08-01/deletedservice/predicates.go
index 9680e30497a..54bf3b119fb 100644
--- a/resource-manager/apimanagement/2022-08-01/deletedservice/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/deletedservice/predicates.go
@@ -12,19 +12,19 @@ type DeletedServiceContractOperationPredicate struct {
 
 func (p DeletedServiceContractOperationPredicate) Matches(input DeletedServiceContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/diagnostic/predicates.go b/resource-manager/apimanagement/2022-08-01/diagnostic/predicates.go
index ab620b48461..1a3641637d2 100644
--- a/resource-manager/apimanagement/2022-08-01/diagnostic/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/diagnostic/predicates.go
@@ -11,15 +11,15 @@ type DiagnosticContractOperationPredicate struct {
 
 func (p DiagnosticContractOperationPredicate) Matches(input DiagnosticContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/documentationresource/predicates.go b/resource-manager/apimanagement/2022-08-01/documentationresource/predicates.go
index b60afd631a7..5c6853fdaa4 100644
--- a/resource-manager/apimanagement/2022-08-01/documentationresource/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/documentationresource/predicates.go
@@ -11,15 +11,15 @@ type DocumentationContractOperationPredicate struct {
 
 func (p DocumentationContractOperationPredicate) Matches(input DocumentationContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/emailtemplate/predicates.go b/resource-manager/apimanagement/2022-08-01/emailtemplate/predicates.go
index 0d9d323e51b..9a8a270e788 100644
--- a/resource-manager/apimanagement/2022-08-01/emailtemplate/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/emailtemplate/predicates.go
@@ -11,15 +11,15 @@ type EmailTemplateContractOperationPredicate struct {
 
 func (p EmailTemplateContractOperationPredicate) Matches(input EmailTemplateContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/gateway/predicates.go b/resource-manager/apimanagement/2022-08-01/gateway/predicates.go
index 6a483a0683f..e3df21dd4c0 100644
--- a/resource-manager/apimanagement/2022-08-01/gateway/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/gateway/predicates.go
@@ -11,15 +11,15 @@ type GatewayContractOperationPredicate struct {
 
 func (p GatewayContractOperationPredicate) Matches(input GatewayContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/gatewayapi/predicates.go b/resource-manager/apimanagement/2022-08-01/gatewayapi/predicates.go
index afe855d4db9..46947f21478 100644
--- a/resource-manager/apimanagement/2022-08-01/gatewayapi/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/gatewayapi/predicates.go
@@ -11,15 +11,15 @@ type ApiContractOperationPredicate struct {
 
 func (p ApiContractOperationPredicate) Matches(input ApiContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/gatewaycertificateauthority/predicates.go b/resource-manager/apimanagement/2022-08-01/gatewaycertificateauthority/predicates.go
index 1f1f4058d32..10927ccab9f 100644
--- a/resource-manager/apimanagement/2022-08-01/gatewaycertificateauthority/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/gatewaycertificateauthority/predicates.go
@@ -11,15 +11,15 @@ type GatewayCertificateAuthorityContractOperationPredicate struct {
 
 func (p GatewayCertificateAuthorityContractOperationPredicate) Matches(input GatewayCertificateAuthorityContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/gatewayhostnameconfiguration/predicates.go b/resource-manager/apimanagement/2022-08-01/gatewayhostnameconfiguration/predicates.go
index c595878e338..737fbb773b4 100644
--- a/resource-manager/apimanagement/2022-08-01/gatewayhostnameconfiguration/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/gatewayhostnameconfiguration/predicates.go
@@ -11,15 +11,15 @@ type GatewayHostnameConfigurationContractOperationPredicate struct {
 
 func (p GatewayHostnameConfigurationContractOperationPredicate) Matches(input GatewayHostnameConfigurationContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/graphqlapiresolver/predicates.go b/resource-manager/apimanagement/2022-08-01/graphqlapiresolver/predicates.go
index cc82273c61c..2e2dabe5bd9 100644
--- a/resource-manager/apimanagement/2022-08-01/graphqlapiresolver/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/graphqlapiresolver/predicates.go
@@ -11,15 +11,15 @@ type ResolverContractOperationPredicate struct {
 
 func (p ResolverContractOperationPredicate) Matches(input ResolverContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/graphqlapiresolverpolicy/predicates.go b/resource-manager/apimanagement/2022-08-01/graphqlapiresolverpolicy/predicates.go
index bb102a5e397..5da8b74603b 100644
--- a/resource-manager/apimanagement/2022-08-01/graphqlapiresolverpolicy/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/graphqlapiresolverpolicy/predicates.go
@@ -11,15 +11,15 @@ type PolicyContractOperationPredicate struct {
 
 func (p PolicyContractOperationPredicate) Matches(input PolicyContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/group/predicates.go b/resource-manager/apimanagement/2022-08-01/group/predicates.go
index 5a7c61a2911..c6031629295 100644
--- a/resource-manager/apimanagement/2022-08-01/group/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/group/predicates.go
@@ -11,15 +11,15 @@ type GroupContractOperationPredicate struct {
 
 func (p GroupContractOperationPredicate) Matches(input GroupContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/groupuser/predicates.go b/resource-manager/apimanagement/2022-08-01/groupuser/predicates.go
index 04011097569..c2691a6325d 100644
--- a/resource-manager/apimanagement/2022-08-01/groupuser/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/groupuser/predicates.go
@@ -11,15 +11,15 @@ type UserContractOperationPredicate struct {
 
 func (p UserContractOperationPredicate) Matches(input UserContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/identityprovider/predicates.go b/resource-manager/apimanagement/2022-08-01/identityprovider/predicates.go
index 50f3efc320c..106538ef5e6 100644
--- a/resource-manager/apimanagement/2022-08-01/identityprovider/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/identityprovider/predicates.go
@@ -11,15 +11,15 @@ type IdentityProviderContractOperationPredicate struct {
 
 func (p IdentityProviderContractOperationPredicate) Matches(input IdentityProviderContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/issue/predicates.go b/resource-manager/apimanagement/2022-08-01/issue/predicates.go
index 96bca9022aa..f0a8d6f81ad 100644
--- a/resource-manager/apimanagement/2022-08-01/issue/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/issue/predicates.go
@@ -11,15 +11,15 @@ type IssueContractOperationPredicate struct {
 
 func (p IssueContractOperationPredicate) Matches(input IssueContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/logger/predicates.go b/resource-manager/apimanagement/2022-08-01/logger/predicates.go
index d3a61c2fb22..9dfff89de12 100644
--- a/resource-manager/apimanagement/2022-08-01/logger/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/logger/predicates.go
@@ -11,15 +11,15 @@ type LoggerContractOperationPredicate struct {
 
 func (p LoggerContractOperationPredicate) Matches(input LoggerContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/namedvalue/predicates.go b/resource-manager/apimanagement/2022-08-01/namedvalue/predicates.go
index 841c06f9515..7bffc82f9da 100644
--- a/resource-manager/apimanagement/2022-08-01/namedvalue/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/namedvalue/predicates.go
@@ -11,15 +11,15 @@ type NamedValueContractOperationPredicate struct {
 
 func (p NamedValueContractOperationPredicate) Matches(input NamedValueContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/notification/predicates.go b/resource-manager/apimanagement/2022-08-01/notification/predicates.go
index 90cccc3650c..7235194fc77 100644
--- a/resource-manager/apimanagement/2022-08-01/notification/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/notification/predicates.go
@@ -11,15 +11,15 @@ type NotificationContractOperationPredicate struct {
 
 func (p NotificationContractOperationPredicate) Matches(input NotificationContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/openidconnectprovider/predicates.go b/resource-manager/apimanagement/2022-08-01/openidconnectprovider/predicates.go
index 808564b7082..9a85ff23a16 100644
--- a/resource-manager/apimanagement/2022-08-01/openidconnectprovider/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/openidconnectprovider/predicates.go
@@ -11,15 +11,15 @@ type OpenidConnectProviderContractOperationPredicate struct {
 
 func (p OpenidConnectProviderContractOperationPredicate) Matches(input OpenidConnectProviderContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/portalrevision/predicates.go b/resource-manager/apimanagement/2022-08-01/portalrevision/predicates.go
index b091c77b834..fa276f0afc0 100644
--- a/resource-manager/apimanagement/2022-08-01/portalrevision/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/portalrevision/predicates.go
@@ -11,15 +11,15 @@ type PortalRevisionContractOperationPredicate struct {
 
 func (p PortalRevisionContractOperationPredicate) Matches(input PortalRevisionContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/product/predicates.go b/resource-manager/apimanagement/2022-08-01/product/predicates.go
index b9946328368..7e24e47c6fc 100644
--- a/resource-manager/apimanagement/2022-08-01/product/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/product/predicates.go
@@ -11,15 +11,15 @@ type ProductContractOperationPredicate struct {
 
 func (p ProductContractOperationPredicate) Matches(input ProductContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/productapi/predicates.go b/resource-manager/apimanagement/2022-08-01/productapi/predicates.go
index 1884618978c..291c7d4c7b5 100644
--- a/resource-manager/apimanagement/2022-08-01/productapi/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/productapi/predicates.go
@@ -11,15 +11,15 @@ type ApiContractOperationPredicate struct {
 
 func (p ApiContractOperationPredicate) Matches(input ApiContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/productgroup/predicates.go b/resource-manager/apimanagement/2022-08-01/productgroup/predicates.go
index 8dea18d8f9e..6d25db13cf9 100644
--- a/resource-manager/apimanagement/2022-08-01/productgroup/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/productgroup/predicates.go
@@ -11,15 +11,15 @@ type GroupContractOperationPredicate struct {
 
 func (p GroupContractOperationPredicate) Matches(input GroupContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/productsubscription/predicates.go b/resource-manager/apimanagement/2022-08-01/productsubscription/predicates.go
index 0ab50d385f2..66c5b3fd316 100644
--- a/resource-manager/apimanagement/2022-08-01/productsubscription/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/productsubscription/predicates.go
@@ -11,15 +11,15 @@ type SubscriptionContractOperationPredicate struct {
 
 func (p SubscriptionContractOperationPredicate) Matches(input SubscriptionContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/producttag/predicates.go b/resource-manager/apimanagement/2022-08-01/producttag/predicates.go
index 8c8ae7d1318..cc40ebaa06a 100644
--- a/resource-manager/apimanagement/2022-08-01/producttag/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/producttag/predicates.go
@@ -11,15 +11,15 @@ type TagContractOperationPredicate struct {
 
 func (p TagContractOperationPredicate) Matches(input TagContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/productwiki/predicates.go b/resource-manager/apimanagement/2022-08-01/productwiki/predicates.go
index e73ae1ee43a..e91edaf5c86 100644
--- a/resource-manager/apimanagement/2022-08-01/productwiki/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/productwiki/predicates.go
@@ -11,15 +11,15 @@ type WikiContractOperationPredicate struct {
 
 func (p WikiContractOperationPredicate) Matches(input WikiContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/region/predicates.go b/resource-manager/apimanagement/2022-08-01/region/predicates.go
index 49b61b040fc..30ed56319df 100644
--- a/resource-manager/apimanagement/2022-08-01/region/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/region/predicates.go
@@ -11,15 +11,15 @@ type RegionContractOperationPredicate struct {
 
 func (p RegionContractOperationPredicate) Matches(input RegionContract) bool {
 
-	if p.IsDeleted != nil && (input.IsDeleted == nil && *p.IsDeleted != *input.IsDeleted) {
+	if p.IsDeleted != nil && (input.IsDeleted == nil || *p.IsDeleted != *input.IsDeleted) {
 		return false
 	}
 
-	if p.IsMasterRegion != nil && (input.IsMasterRegion == nil && *p.IsMasterRegion != *input.IsMasterRegion) {
+	if p.IsMasterRegion != nil && (input.IsMasterRegion == nil || *p.IsMasterRegion != *input.IsMasterRegion) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/reports/predicates.go b/resource-manager/apimanagement/2022-08-01/reports/predicates.go
index 9cb1ebcfe61..752c5ee660a 100644
--- a/resource-manager/apimanagement/2022-08-01/reports/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/reports/predicates.go
@@ -34,107 +34,107 @@ type ReportRecordContractOperationPredicate struct {
 
 func (p ReportRecordContractOperationPredicate) Matches(input ReportRecordContract) bool {
 
-	if p.ApiId != nil && (input.ApiId == nil && *p.ApiId != *input.ApiId) {
+	if p.ApiId != nil && (input.ApiId == nil || *p.ApiId != *input.ApiId) {
 		return false
 	}
 
-	if p.ApiRegion != nil && (input.ApiRegion == nil && *p.ApiRegion != *input.ApiRegion) {
+	if p.ApiRegion != nil && (input.ApiRegion == nil || *p.ApiRegion != *input.ApiRegion) {
 		return false
 	}
 
-	if p.ApiTimeAvg != nil && (input.ApiTimeAvg == nil && *p.ApiTimeAvg != *input.ApiTimeAvg) {
+	if p.ApiTimeAvg != nil && (input.ApiTimeAvg == nil || *p.ApiTimeAvg != *input.ApiTimeAvg) {
 		return false
 	}
 
-	if p.ApiTimeMax != nil && (input.ApiTimeMax == nil && *p.ApiTimeMax != *input.ApiTimeMax) {
+	if p.ApiTimeMax != nil && (input.ApiTimeMax == nil || *p.ApiTimeMax != *input.ApiTimeMax) {
 		return false
 	}
 
-	if p.ApiTimeMin != nil && (input.ApiTimeMin == nil && *p.ApiTimeMin != *input.ApiTimeMin) {
+	if p.ApiTimeMin != nil && (input.ApiTimeMin == nil || *p.ApiTimeMin != *input.ApiTimeMin) {
 		return false
 	}
 
-	if p.Bandwidth != nil && (input.Bandwidth == nil && *p.Bandwidth != *input.Bandwidth) {
+	if p.Bandwidth != nil && (input.Bandwidth == nil || *p.Bandwidth != *input.Bandwidth) {
 		return false
 	}
 
-	if p.CacheHitCount != nil && (input.CacheHitCount == nil && *p.CacheHitCount != *input.CacheHitCount) {
+	if p.CacheHitCount != nil && (input.CacheHitCount == nil || *p.CacheHitCount != *input.CacheHitCount) {
 		return false
 	}
 
-	if p.CacheMissCount != nil && (input.CacheMissCount == nil && *p.CacheMissCount != *input.CacheMissCount) {
+	if p.CacheMissCount != nil && (input.CacheMissCount == nil || *p.CacheMissCount != *input.CacheMissCount) {
 		return false
 	}
 
-	if p.CallCountBlocked != nil && (input.CallCountBlocked == nil && *p.CallCountBlocked != *input.CallCountBlocked) {
+	if p.CallCountBlocked != nil && (input.CallCountBlocked == nil || *p.CallCountBlocked != *input.CallCountBlocked) {
 		return false
 	}
 
-	if p.CallCountFailed != nil && (input.CallCountFailed == nil && *p.CallCountFailed != *input.CallCountFailed) {
+	if p.CallCountFailed != nil && (input.CallCountFailed == nil || *p.CallCountFailed != *input.CallCountFailed) {
 		return false
 	}
 
-	if p.CallCountOther != nil && (input.CallCountOther == nil && *p.CallCountOther != *input.CallCountOther) {
+	if p.CallCountOther != nil && (input.CallCountOther == nil || *p.CallCountOther != *input.CallCountOther) {
 		return false
 	}
 
-	if p.CallCountSuccess != nil && (input.CallCountSuccess == nil && *p.CallCountSuccess != *input.CallCountSuccess) {
+	if p.CallCountSuccess != nil && (input.CallCountSuccess == nil || *p.CallCountSuccess != *input.CallCountSuccess) {
 		return false
 	}
 
-	if p.CallCountTotal != nil && (input.CallCountTotal == nil && *p.CallCountTotal != *input.CallCountTotal) {
+	if p.CallCountTotal != nil && (input.CallCountTotal == nil || *p.CallCountTotal != *input.CallCountTotal) {
 		return false
 	}
 
-	if p.Country != nil && (input.Country == nil && *p.Country != *input.Country) {
+	if p.Country != nil && (input.Country == nil || *p.Country != *input.Country) {
 		return false
 	}
 
-	if p.Interval != nil && (input.Interval == nil && *p.Interval != *input.Interval) {
+	if p.Interval != nil && (input.Interval == nil || *p.Interval != *input.Interval) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.OperationId != nil && (input.OperationId == nil && *p.OperationId != *input.OperationId) {
+	if p.OperationId != nil && (input.OperationId == nil || *p.OperationId != *input.OperationId) {
 		return false
 	}
 
-	if p.ProductId != nil && (input.ProductId == nil && *p.ProductId != *input.ProductId) {
+	if p.ProductId != nil && (input.ProductId == nil || *p.ProductId != *input.ProductId) {
 		return false
 	}
 
-	if p.Region != nil && (input.Region == nil && *p.Region != *input.Region) {
+	if p.Region != nil && (input.Region == nil || *p.Region != *input.Region) {
 		return false
 	}
 
-	if p.ServiceTimeAvg != nil && (input.ServiceTimeAvg == nil && *p.ServiceTimeAvg != *input.ServiceTimeAvg) {
+	if p.ServiceTimeAvg != nil && (input.ServiceTimeAvg == nil || *p.ServiceTimeAvg != *input.ServiceTimeAvg) {
 		return false
 	}
 
-	if p.ServiceTimeMax != nil && (input.ServiceTimeMax == nil && *p.ServiceTimeMax != *input.ServiceTimeMax) {
+	if p.ServiceTimeMax != nil && (input.ServiceTimeMax == nil || *p.ServiceTimeMax != *input.ServiceTimeMax) {
 		return false
 	}
 
-	if p.ServiceTimeMin != nil && (input.ServiceTimeMin == nil && *p.ServiceTimeMin != *input.ServiceTimeMin) {
+	if p.ServiceTimeMin != nil && (input.ServiceTimeMin == nil || *p.ServiceTimeMin != *input.ServiceTimeMin) {
 		return false
 	}
 
-	if p.SubscriptionId != nil && (input.SubscriptionId == nil && *p.SubscriptionId != *input.SubscriptionId) {
+	if p.SubscriptionId != nil && (input.SubscriptionId == nil || *p.SubscriptionId != *input.SubscriptionId) {
 		return false
 	}
 
-	if p.Timestamp != nil && (input.Timestamp == nil && *p.Timestamp != *input.Timestamp) {
+	if p.Timestamp != nil && (input.Timestamp == nil || *p.Timestamp != *input.Timestamp) {
 		return false
 	}
 
-	if p.UserId != nil && (input.UserId == nil && *p.UserId != *input.UserId) {
+	if p.UserId != nil && (input.UserId == nil || *p.UserId != *input.UserId) {
 		return false
 	}
 
-	if p.Zip != nil && (input.Zip == nil && *p.Zip != *input.Zip) {
+	if p.Zip != nil && (input.Zip == nil || *p.Zip != *input.Zip) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/schema/predicates.go b/resource-manager/apimanagement/2022-08-01/schema/predicates.go
index c08f263d9bf..7f16ac143ee 100644
--- a/resource-manager/apimanagement/2022-08-01/schema/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/schema/predicates.go
@@ -11,15 +11,15 @@ type GlobalSchemaContractOperationPredicate struct {
 
 func (p GlobalSchemaContractOperationPredicate) Matches(input GlobalSchemaContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/skus/predicates.go b/resource-manager/apimanagement/2022-08-01/skus/predicates.go
index d9163da2378..76a27562558 100644
--- a/resource-manager/apimanagement/2022-08-01/skus/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/skus/predicates.go
@@ -14,27 +14,27 @@ type ApiManagementSkuOperationPredicate struct {
 
 func (p ApiManagementSkuOperationPredicate) Matches(input ApiManagementSku) bool {
 
-	if p.Family != nil && (input.Family == nil && *p.Family != *input.Family) {
+	if p.Family != nil && (input.Family == nil || *p.Family != *input.Family) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
-	if p.Size != nil && (input.Size == nil && *p.Size != *input.Size) {
+	if p.Size != nil && (input.Size == nil || *p.Size != *input.Size) {
 		return false
 	}
 
-	if p.Tier != nil && (input.Tier == nil && *p.Tier != *input.Tier) {
+	if p.Tier != nil && (input.Tier == nil || *p.Tier != *input.Tier) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/subscription/predicates.go b/resource-manager/apimanagement/2022-08-01/subscription/predicates.go
index 72dda71bb68..71fb75412ad 100644
--- a/resource-manager/apimanagement/2022-08-01/subscription/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/subscription/predicates.go
@@ -11,15 +11,15 @@ type SubscriptionContractOperationPredicate struct {
 
 func (p SubscriptionContractOperationPredicate) Matches(input SubscriptionContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/tag/predicates.go b/resource-manager/apimanagement/2022-08-01/tag/predicates.go
index f31ec0ecc97..b05086d88d1 100644
--- a/resource-manager/apimanagement/2022-08-01/tag/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/tag/predicates.go
@@ -11,15 +11,15 @@ type TagContractOperationPredicate struct {
 
 func (p TagContractOperationPredicate) Matches(input TagContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/tenantaccess/predicates.go b/resource-manager/apimanagement/2022-08-01/tenantaccess/predicates.go
index ec5649fa53d..309dabec476 100644
--- a/resource-manager/apimanagement/2022-08-01/tenantaccess/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/tenantaccess/predicates.go
@@ -11,15 +11,15 @@ type AccessInformationContractOperationPredicate struct {
 
 func (p AccessInformationContractOperationPredicate) Matches(input AccessInformationContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/tenantsettings/predicates.go b/resource-manager/apimanagement/2022-08-01/tenantsettings/predicates.go
index f50bc92f64d..6cba8bfd733 100644
--- a/resource-manager/apimanagement/2022-08-01/tenantsettings/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/tenantsettings/predicates.go
@@ -11,15 +11,15 @@ type TenantSettingsContractOperationPredicate struct {
 
 func (p TenantSettingsContractOperationPredicate) Matches(input TenantSettingsContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/user/predicates.go b/resource-manager/apimanagement/2022-08-01/user/predicates.go
index 160c4aa77d8..70f897ed2a9 100644
--- a/resource-manager/apimanagement/2022-08-01/user/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/user/predicates.go
@@ -11,15 +11,15 @@ type UserContractOperationPredicate struct {
 
 func (p UserContractOperationPredicate) Matches(input UserContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/usergroup/predicates.go b/resource-manager/apimanagement/2022-08-01/usergroup/predicates.go
index 67e02a6c2be..b8c0bb39d17 100644
--- a/resource-manager/apimanagement/2022-08-01/usergroup/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/usergroup/predicates.go
@@ -11,15 +11,15 @@ type GroupContractOperationPredicate struct {
 
 func (p GroupContractOperationPredicate) Matches(input GroupContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/useridentity/predicates.go b/resource-manager/apimanagement/2022-08-01/useridentity/predicates.go
index fb5557934b8..a706d5676ec 100644
--- a/resource-manager/apimanagement/2022-08-01/useridentity/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/useridentity/predicates.go
@@ -10,11 +10,11 @@ type UserIdentityContractOperationPredicate struct {
 
 func (p UserIdentityContractOperationPredicate) Matches(input UserIdentityContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Provider != nil && (input.Provider == nil && *p.Provider != *input.Provider) {
+	if p.Provider != nil && (input.Provider == nil || *p.Provider != *input.Provider) {
 		return false
 	}
 
diff --git a/resource-manager/apimanagement/2022-08-01/usersubscription/predicates.go b/resource-manager/apimanagement/2022-08-01/usersubscription/predicates.go
index e38802fc39c..9b6a14afde7 100644
--- a/resource-manager/apimanagement/2022-08-01/usersubscription/predicates.go
+++ b/resource-manager/apimanagement/2022-08-01/usersubscription/predicates.go
@@ -11,15 +11,15 @@ type SubscriptionContractOperationPredicate struct {
 
 func (p SubscriptionContractOperationPredicate) Matches(input SubscriptionContract) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/appconfiguration/2023-03-01/configurationstores/predicates.go b/resource-manager/appconfiguration/2023-03-01/configurationstores/predicates.go
index 19a1297ef2e..8fad9c6bbf4 100644
--- a/resource-manager/appconfiguration/2023-03-01/configurationstores/predicates.go
+++ b/resource-manager/appconfiguration/2023-03-01/configurationstores/predicates.go
@@ -14,27 +14,27 @@ type ApiKeyOperationPredicate struct {
 
 func (p ApiKeyOperationPredicate) Matches(input ApiKey) bool {
 
-	if p.ConnectionString != nil && (input.ConnectionString == nil && *p.ConnectionString != *input.ConnectionString) {
+	if p.ConnectionString != nil && (input.ConnectionString == nil || *p.ConnectionString != *input.ConnectionString) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.LastModified != nil && (input.LastModified == nil && *p.LastModified != *input.LastModified) {
+	if p.LastModified != nil && (input.LastModified == nil || *p.LastModified != *input.LastModified) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ReadOnly != nil && (input.ReadOnly == nil && *p.ReadOnly != *input.ReadOnly) {
+	if p.ReadOnly != nil && (input.ReadOnly == nil || *p.ReadOnly != *input.ReadOnly) {
 		return false
 	}
 
-	if p.Value != nil && (input.Value == nil && *p.Value != *input.Value) {
+	if p.Value != nil && (input.Value == nil || *p.Value != *input.Value) {
 		return false
 	}
 
@@ -50,7 +50,7 @@ type ConfigurationStoreOperationPredicate struct {
 
 func (p ConfigurationStoreOperationPredicate) Matches(input ConfigurationStore) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -58,11 +58,11 @@ func (p ConfigurationStoreOperationPredicate) Matches(input ConfigurationStore)
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/appconfiguration/2023-03-01/deletedconfigurationstores/predicates.go b/resource-manager/appconfiguration/2023-03-01/deletedconfigurationstores/predicates.go
index 08cfdd02717..073bf01807a 100644
--- a/resource-manager/appconfiguration/2023-03-01/deletedconfigurationstores/predicates.go
+++ b/resource-manager/appconfiguration/2023-03-01/deletedconfigurationstores/predicates.go
@@ -11,15 +11,15 @@ type DeletedConfigurationStoreOperationPredicate struct {
 
 func (p DeletedConfigurationStoreOperationPredicate) Matches(input DeletedConfigurationStore) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/appconfiguration/2023-03-01/privateendpointconnections/predicates.go b/resource-manager/appconfiguration/2023-03-01/privateendpointconnections/predicates.go
index bea3f66b397..4a03a91ce52 100644
--- a/resource-manager/appconfiguration/2023-03-01/privateendpointconnections/predicates.go
+++ b/resource-manager/appconfiguration/2023-03-01/privateendpointconnections/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/appconfiguration/2023-03-01/privatelinkresources/predicates.go b/resource-manager/appconfiguration/2023-03-01/privatelinkresources/predicates.go
index 29d787f073a..19b771c3994 100644
--- a/resource-manager/appconfiguration/2023-03-01/privatelinkresources/predicates.go
+++ b/resource-manager/appconfiguration/2023-03-01/privatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/appconfiguration/2023-03-01/replicas/predicates.go b/resource-manager/appconfiguration/2023-03-01/replicas/predicates.go
index 9dd3706f57c..436f7639b38 100644
--- a/resource-manager/appconfiguration/2023-03-01/replicas/predicates.go
+++ b/resource-manager/appconfiguration/2023-03-01/replicas/predicates.go
@@ -12,19 +12,19 @@ type ReplicaOperationPredicate struct {
 
 func (p ReplicaOperationPredicate) Matches(input Replica) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/applicationinsights/2022-04-01/workbooksapis/predicates.go b/resource-manager/applicationinsights/2022-04-01/workbooksapis/predicates.go
index 7b8cbfb5b43..265061fad7e 100644
--- a/resource-manager/applicationinsights/2022-04-01/workbooksapis/predicates.go
+++ b/resource-manager/applicationinsights/2022-04-01/workbooksapis/predicates.go
@@ -13,23 +13,23 @@ type WorkbookOperationPredicate struct {
 
 func (p WorkbookOperationPredicate) Matches(input Workbook) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/applicationinsights/2022-06-15/webtestsapis/predicates.go b/resource-manager/applicationinsights/2022-06-15/webtestsapis/predicates.go
index c80f410073e..0b1b8e84993 100644
--- a/resource-manager/applicationinsights/2022-06-15/webtestsapis/predicates.go
+++ b/resource-manager/applicationinsights/2022-06-15/webtestsapis/predicates.go
@@ -12,7 +12,7 @@ type WebTestOperationPredicate struct {
 
 func (p WebTestOperationPredicate) Matches(input WebTest) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p WebTestOperationPredicate) Matches(input WebTest) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/appplatform/2022-09-01-preview/appplatform/predicates.go b/resource-manager/appplatform/2022-09-01-preview/appplatform/predicates.go
index 64013ee9757..3a7331133f0 100644
--- a/resource-manager/appplatform/2022-09-01-preview/appplatform/predicates.go
+++ b/resource-manager/appplatform/2022-09-01-preview/appplatform/predicates.go
@@ -11,15 +11,15 @@ type ApiPortalCustomDomainResourceOperationPredicate struct {
 
 func (p ApiPortalCustomDomainResourceOperationPredicate) Matches(input ApiPortalCustomDomainResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type ApiPortalResourceOperationPredicate struct {
 
 func (p ApiPortalResourceOperationPredicate) Matches(input ApiPortalResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -58,19 +58,19 @@ type AppResourceOperationPredicate struct {
 
 func (p AppResourceOperationPredicate) Matches(input AppResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -85,15 +85,15 @@ type BindingResourceOperationPredicate struct {
 
 func (p BindingResourceOperationPredicate) Matches(input BindingResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -108,15 +108,15 @@ type BuildOperationPredicate struct {
 
 func (p BuildOperationPredicate) Matches(input Build) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -131,15 +131,15 @@ type BuildResultOperationPredicate struct {
 
 func (p BuildResultOperationPredicate) Matches(input BuildResult) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -154,15 +154,15 @@ type BuildServiceOperationPredicate struct {
 
 func (p BuildServiceOperationPredicate) Matches(input BuildService) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -177,15 +177,15 @@ type BuildServiceAgentPoolResourceOperationPredicate struct {
 
 func (p BuildServiceAgentPoolResourceOperationPredicate) Matches(input BuildServiceAgentPoolResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -200,15 +200,15 @@ type BuilderResourceOperationPredicate struct {
 
 func (p BuilderResourceOperationPredicate) Matches(input BuilderResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -223,15 +223,15 @@ type BuildpackBindingResourceOperationPredicate struct {
 
 func (p BuildpackBindingResourceOperationPredicate) Matches(input BuildpackBindingResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -246,15 +246,15 @@ type CertificateResourceOperationPredicate struct {
 
 func (p CertificateResourceOperationPredicate) Matches(input CertificateResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -269,15 +269,15 @@ type ConfigurationServiceResourceOperationPredicate struct {
 
 func (p ConfigurationServiceResourceOperationPredicate) Matches(input ConfigurationServiceResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -292,15 +292,15 @@ type CustomDomainResourceOperationPredicate struct {
 
 func (p CustomDomainResourceOperationPredicate) Matches(input CustomDomainResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -315,15 +315,15 @@ type DeploymentResourceOperationPredicate struct {
 
 func (p DeploymentResourceOperationPredicate) Matches(input DeploymentResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -338,15 +338,15 @@ type GatewayCustomDomainResourceOperationPredicate struct {
 
 func (p GatewayCustomDomainResourceOperationPredicate) Matches(input GatewayCustomDomainResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -361,15 +361,15 @@ type GatewayResourceOperationPredicate struct {
 
 func (p GatewayResourceOperationPredicate) Matches(input GatewayResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -384,15 +384,15 @@ type GatewayRouteConfigResourceOperationPredicate struct {
 
 func (p GatewayRouteConfigResourceOperationPredicate) Matches(input GatewayRouteConfigResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -407,15 +407,15 @@ type ResourceSkuOperationPredicate struct {
 
 func (p ResourceSkuOperationPredicate) Matches(input ResourceSku) bool {
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
-	if p.Tier != nil && (input.Tier == nil && *p.Tier != *input.Tier) {
+	if p.Tier != nil && (input.Tier == nil || *p.Tier != *input.Tier) {
 		return false
 	}
 
@@ -430,15 +430,15 @@ type ServiceRegistryResourceOperationPredicate struct {
 
 func (p ServiceRegistryResourceOperationPredicate) Matches(input ServiceRegistryResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -454,19 +454,19 @@ type ServiceResourceOperationPredicate struct {
 
 func (p ServiceResourceOperationPredicate) Matches(input ServiceResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -481,15 +481,15 @@ type StorageResourceOperationPredicate struct {
 
 func (p StorageResourceOperationPredicate) Matches(input StorageResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/appplatform/2022-12-01/appplatform/predicates.go b/resource-manager/appplatform/2022-12-01/appplatform/predicates.go
index 64013ee9757..3a7331133f0 100644
--- a/resource-manager/appplatform/2022-12-01/appplatform/predicates.go
+++ b/resource-manager/appplatform/2022-12-01/appplatform/predicates.go
@@ -11,15 +11,15 @@ type ApiPortalCustomDomainResourceOperationPredicate struct {
 
 func (p ApiPortalCustomDomainResourceOperationPredicate) Matches(input ApiPortalCustomDomainResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type ApiPortalResourceOperationPredicate struct {
 
 func (p ApiPortalResourceOperationPredicate) Matches(input ApiPortalResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -58,19 +58,19 @@ type AppResourceOperationPredicate struct {
 
 func (p AppResourceOperationPredicate) Matches(input AppResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -85,15 +85,15 @@ type BindingResourceOperationPredicate struct {
 
 func (p BindingResourceOperationPredicate) Matches(input BindingResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -108,15 +108,15 @@ type BuildOperationPredicate struct {
 
 func (p BuildOperationPredicate) Matches(input Build) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -131,15 +131,15 @@ type BuildResultOperationPredicate struct {
 
 func (p BuildResultOperationPredicate) Matches(input BuildResult) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -154,15 +154,15 @@ type BuildServiceOperationPredicate struct {
 
 func (p BuildServiceOperationPredicate) Matches(input BuildService) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -177,15 +177,15 @@ type BuildServiceAgentPoolResourceOperationPredicate struct {
 
 func (p BuildServiceAgentPoolResourceOperationPredicate) Matches(input BuildServiceAgentPoolResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -200,15 +200,15 @@ type BuilderResourceOperationPredicate struct {
 
 func (p BuilderResourceOperationPredicate) Matches(input BuilderResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -223,15 +223,15 @@ type BuildpackBindingResourceOperationPredicate struct {
 
 func (p BuildpackBindingResourceOperationPredicate) Matches(input BuildpackBindingResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -246,15 +246,15 @@ type CertificateResourceOperationPredicate struct {
 
 func (p CertificateResourceOperationPredicate) Matches(input CertificateResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -269,15 +269,15 @@ type ConfigurationServiceResourceOperationPredicate struct {
 
 func (p ConfigurationServiceResourceOperationPredicate) Matches(input ConfigurationServiceResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -292,15 +292,15 @@ type CustomDomainResourceOperationPredicate struct {
 
 func (p CustomDomainResourceOperationPredicate) Matches(input CustomDomainResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -315,15 +315,15 @@ type DeploymentResourceOperationPredicate struct {
 
 func (p DeploymentResourceOperationPredicate) Matches(input DeploymentResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -338,15 +338,15 @@ type GatewayCustomDomainResourceOperationPredicate struct {
 
 func (p GatewayCustomDomainResourceOperationPredicate) Matches(input GatewayCustomDomainResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -361,15 +361,15 @@ type GatewayResourceOperationPredicate struct {
 
 func (p GatewayResourceOperationPredicate) Matches(input GatewayResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -384,15 +384,15 @@ type GatewayRouteConfigResourceOperationPredicate struct {
 
 func (p GatewayRouteConfigResourceOperationPredicate) Matches(input GatewayRouteConfigResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -407,15 +407,15 @@ type ResourceSkuOperationPredicate struct {
 
 func (p ResourceSkuOperationPredicate) Matches(input ResourceSku) bool {
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
-	if p.Tier != nil && (input.Tier == nil && *p.Tier != *input.Tier) {
+	if p.Tier != nil && (input.Tier == nil || *p.Tier != *input.Tier) {
 		return false
 	}
 
@@ -430,15 +430,15 @@ type ServiceRegistryResourceOperationPredicate struct {
 
 func (p ServiceRegistryResourceOperationPredicate) Matches(input ServiceRegistryResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -454,19 +454,19 @@ type ServiceResourceOperationPredicate struct {
 
 func (p ServiceResourceOperationPredicate) Matches(input ServiceResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -481,15 +481,15 @@ type StorageResourceOperationPredicate struct {
 
 func (p StorageResourceOperationPredicate) Matches(input StorageResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/authorization/2020-10-01/eligiblechildresources/predicates.go b/resource-manager/authorization/2020-10-01/eligiblechildresources/predicates.go
index 58d9e379395..38162aa6cba 100644
--- a/resource-manager/authorization/2020-10-01/eligiblechildresources/predicates.go
+++ b/resource-manager/authorization/2020-10-01/eligiblechildresources/predicates.go
@@ -11,15 +11,15 @@ type EligibleChildResourceOperationPredicate struct {
 
 func (p EligibleChildResourceOperationPredicate) Matches(input EligibleChildResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/authorization/2020-10-01/roleassignmentscheduleinstances/predicates.go b/resource-manager/authorization/2020-10-01/roleassignmentscheduleinstances/predicates.go
index 7e4bd321d16..1a11ed88050 100644
--- a/resource-manager/authorization/2020-10-01/roleassignmentscheduleinstances/predicates.go
+++ b/resource-manager/authorization/2020-10-01/roleassignmentscheduleinstances/predicates.go
@@ -11,15 +11,15 @@ type RoleAssignmentScheduleInstanceOperationPredicate struct {
 
 func (p RoleAssignmentScheduleInstanceOperationPredicate) Matches(input RoleAssignmentScheduleInstance) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/authorization/2020-10-01/roleassignmentschedulerequests/predicates.go b/resource-manager/authorization/2020-10-01/roleassignmentschedulerequests/predicates.go
index 09699b71725..d2f3a60ceb3 100644
--- a/resource-manager/authorization/2020-10-01/roleassignmentschedulerequests/predicates.go
+++ b/resource-manager/authorization/2020-10-01/roleassignmentschedulerequests/predicates.go
@@ -11,15 +11,15 @@ type RoleAssignmentScheduleRequestOperationPredicate struct {
 
 func (p RoleAssignmentScheduleRequestOperationPredicate) Matches(input RoleAssignmentScheduleRequest) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/authorization/2020-10-01/roleassignmentschedules/predicates.go b/resource-manager/authorization/2020-10-01/roleassignmentschedules/predicates.go
index 0f1d12ba30a..ac48499025f 100644
--- a/resource-manager/authorization/2020-10-01/roleassignmentschedules/predicates.go
+++ b/resource-manager/authorization/2020-10-01/roleassignmentschedules/predicates.go
@@ -11,15 +11,15 @@ type RoleAssignmentScheduleOperationPredicate struct {
 
 func (p RoleAssignmentScheduleOperationPredicate) Matches(input RoleAssignmentSchedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/authorization/2020-10-01/roleeligibilityscheduleinstances/predicates.go b/resource-manager/authorization/2020-10-01/roleeligibilityscheduleinstances/predicates.go
index ced4b7e08df..c63ed0d540f 100644
--- a/resource-manager/authorization/2020-10-01/roleeligibilityscheduleinstances/predicates.go
+++ b/resource-manager/authorization/2020-10-01/roleeligibilityscheduleinstances/predicates.go
@@ -11,15 +11,15 @@ type RoleEligibilityScheduleInstanceOperationPredicate struct {
 
 func (p RoleEligibilityScheduleInstanceOperationPredicate) Matches(input RoleEligibilityScheduleInstance) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/authorization/2020-10-01/roleeligibilityschedulerequests/predicates.go b/resource-manager/authorization/2020-10-01/roleeligibilityschedulerequests/predicates.go
index 8f81dec7cb4..3f6f6ba0ce1 100644
--- a/resource-manager/authorization/2020-10-01/roleeligibilityschedulerequests/predicates.go
+++ b/resource-manager/authorization/2020-10-01/roleeligibilityschedulerequests/predicates.go
@@ -11,15 +11,15 @@ type RoleEligibilityScheduleRequestOperationPredicate struct {
 
 func (p RoleEligibilityScheduleRequestOperationPredicate) Matches(input RoleEligibilityScheduleRequest) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/authorization/2020-10-01/roleeligibilityschedules/predicates.go b/resource-manager/authorization/2020-10-01/roleeligibilityschedules/predicates.go
index 265bfa955f2..50b39a7215b 100644
--- a/resource-manager/authorization/2020-10-01/roleeligibilityschedules/predicates.go
+++ b/resource-manager/authorization/2020-10-01/roleeligibilityschedules/predicates.go
@@ -11,15 +11,15 @@ type RoleEligibilityScheduleOperationPredicate struct {
 
 func (p RoleEligibilityScheduleOperationPredicate) Matches(input RoleEligibilitySchedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/authorization/2020-10-01/rolemanagementpolicies/predicates.go b/resource-manager/authorization/2020-10-01/rolemanagementpolicies/predicates.go
index aeb3f3bc819..7957ae7375f 100644
--- a/resource-manager/authorization/2020-10-01/rolemanagementpolicies/predicates.go
+++ b/resource-manager/authorization/2020-10-01/rolemanagementpolicies/predicates.go
@@ -11,15 +11,15 @@ type RoleManagementPolicyOperationPredicate struct {
 
 func (p RoleManagementPolicyOperationPredicate) Matches(input RoleManagementPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/authorization/2020-10-01/rolemanagementpolicyassignments/predicates.go b/resource-manager/authorization/2020-10-01/rolemanagementpolicyassignments/predicates.go
index c621d2ff796..52bbdac168a 100644
--- a/resource-manager/authorization/2020-10-01/rolemanagementpolicyassignments/predicates.go
+++ b/resource-manager/authorization/2020-10-01/rolemanagementpolicyassignments/predicates.go
@@ -11,15 +11,15 @@ type RoleManagementPolicyAssignmentOperationPredicate struct {
 
 func (p RoleManagementPolicyAssignmentOperationPredicate) Matches(input RoleManagementPolicyAssignment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/authorization/2022-04-01/denyassignments/predicates.go b/resource-manager/authorization/2022-04-01/denyassignments/predicates.go
index 9a381fd0579..3eb98040697 100644
--- a/resource-manager/authorization/2022-04-01/denyassignments/predicates.go
+++ b/resource-manager/authorization/2022-04-01/denyassignments/predicates.go
@@ -11,15 +11,15 @@ type DenyAssignmentOperationPredicate struct {
 
 func (p DenyAssignmentOperationPredicate) Matches(input DenyAssignment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/authorization/2022-04-01/provideroperationsmetadata/predicates.go b/resource-manager/authorization/2022-04-01/provideroperationsmetadata/predicates.go
index c8585cca68a..58f1a8fa51e 100644
--- a/resource-manager/authorization/2022-04-01/provideroperationsmetadata/predicates.go
+++ b/resource-manager/authorization/2022-04-01/provideroperationsmetadata/predicates.go
@@ -12,19 +12,19 @@ type ProviderOperationsMetadataOperationPredicate struct {
 
 func (p ProviderOperationsMetadataOperationPredicate) Matches(input ProviderOperationsMetadata) bool {
 
-	if p.DisplayName != nil && (input.DisplayName == nil && *p.DisplayName != *input.DisplayName) {
+	if p.DisplayName != nil && (input.DisplayName == nil || *p.DisplayName != *input.DisplayName) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/authorization/2022-04-01/roleassignments/predicates.go b/resource-manager/authorization/2022-04-01/roleassignments/predicates.go
index 794a1b40bfd..ecdcef7cde2 100644
--- a/resource-manager/authorization/2022-04-01/roleassignments/predicates.go
+++ b/resource-manager/authorization/2022-04-01/roleassignments/predicates.go
@@ -11,15 +11,15 @@ type RoleAssignmentOperationPredicate struct {
 
 func (p RoleAssignmentOperationPredicate) Matches(input RoleAssignment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/authorization/2022-04-01/roledefinitions/predicates.go b/resource-manager/authorization/2022-04-01/roledefinitions/predicates.go
index 904eadb64cf..9441f95eaf7 100644
--- a/resource-manager/authorization/2022-04-01/roledefinitions/predicates.go
+++ b/resource-manager/authorization/2022-04-01/roledefinitions/predicates.go
@@ -11,15 +11,15 @@ type RoleDefinitionOperationPredicate struct {
 
 func (p RoleDefinitionOperationPredicate) Matches(input RoleDefinition) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2015-10-31/activity/predicates.go b/resource-manager/automation/2015-10-31/activity/predicates.go
index 4e496e3559c..8e0d9fda208 100644
--- a/resource-manager/automation/2015-10-31/activity/predicates.go
+++ b/resource-manager/automation/2015-10-31/activity/predicates.go
@@ -10,11 +10,11 @@ type ActivityOperationPredicate struct {
 
 func (p ActivityOperationPredicate) Matches(input Activity) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2015-10-31/automationaccount/predicates.go b/resource-manager/automation/2015-10-31/automationaccount/predicates.go
index cc203c92b2c..0e3e0289b53 100644
--- a/resource-manager/automation/2015-10-31/automationaccount/predicates.go
+++ b/resource-manager/automation/2015-10-31/automationaccount/predicates.go
@@ -13,23 +13,23 @@ type AutomationAccountOperationPredicate struct {
 
 func (p AutomationAccountOperationPredicate) Matches(input AutomationAccount) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2015-10-31/certificate/predicates.go b/resource-manager/automation/2015-10-31/certificate/predicates.go
index 4aedc2944c2..e5348ea1cb4 100644
--- a/resource-manager/automation/2015-10-31/certificate/predicates.go
+++ b/resource-manager/automation/2015-10-31/certificate/predicates.go
@@ -11,15 +11,15 @@ type CertificateOperationPredicate struct {
 
 func (p CertificateOperationPredicate) Matches(input Certificate) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2015-10-31/connection/predicates.go b/resource-manager/automation/2015-10-31/connection/predicates.go
index b5a1ef66014..3fce88c9236 100644
--- a/resource-manager/automation/2015-10-31/connection/predicates.go
+++ b/resource-manager/automation/2015-10-31/connection/predicates.go
@@ -11,15 +11,15 @@ type ConnectionOperationPredicate struct {
 
 func (p ConnectionOperationPredicate) Matches(input Connection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2015-10-31/connectiontype/predicates.go b/resource-manager/automation/2015-10-31/connectiontype/predicates.go
index 563732498c8..f7d23543367 100644
--- a/resource-manager/automation/2015-10-31/connectiontype/predicates.go
+++ b/resource-manager/automation/2015-10-31/connectiontype/predicates.go
@@ -11,15 +11,15 @@ type ConnectionTypeOperationPredicate struct {
 
 func (p ConnectionTypeOperationPredicate) Matches(input ConnectionType) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2015-10-31/credential/predicates.go b/resource-manager/automation/2015-10-31/credential/predicates.go
index 3fe342bcab8..35c2d317a4c 100644
--- a/resource-manager/automation/2015-10-31/credential/predicates.go
+++ b/resource-manager/automation/2015-10-31/credential/predicates.go
@@ -11,15 +11,15 @@ type CredentialOperationPredicate struct {
 
 func (p CredentialOperationPredicate) Matches(input Credential) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2015-10-31/dsccompilationjob/predicates.go b/resource-manager/automation/2015-10-31/dsccompilationjob/predicates.go
index 318310114c2..3c4d40fe918 100644
--- a/resource-manager/automation/2015-10-31/dsccompilationjob/predicates.go
+++ b/resource-manager/automation/2015-10-31/dsccompilationjob/predicates.go
@@ -11,15 +11,15 @@ type DscCompilationJobOperationPredicate struct {
 
 func (p DscCompilationJobOperationPredicate) Matches(input DscCompilationJob) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2015-10-31/dscconfiguration/predicates.go b/resource-manager/automation/2015-10-31/dscconfiguration/predicates.go
index 85d117369b5..f90f04bdbe1 100644
--- a/resource-manager/automation/2015-10-31/dscconfiguration/predicates.go
+++ b/resource-manager/automation/2015-10-31/dscconfiguration/predicates.go
@@ -13,23 +13,23 @@ type DscConfigurationOperationPredicate struct {
 
 func (p DscConfigurationOperationPredicate) Matches(input DscConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2015-10-31/dscnode/predicates.go b/resource-manager/automation/2015-10-31/dscnode/predicates.go
index eaf00b2941b..2c0af560f4d 100644
--- a/resource-manager/automation/2015-10-31/dscnode/predicates.go
+++ b/resource-manager/automation/2015-10-31/dscnode/predicates.go
@@ -18,43 +18,43 @@ type DscNodeOperationPredicate struct {
 
 func (p DscNodeOperationPredicate) Matches(input DscNode) bool {
 
-	if p.AccountId != nil && (input.AccountId == nil && *p.AccountId != *input.AccountId) {
+	if p.AccountId != nil && (input.AccountId == nil || *p.AccountId != *input.AccountId) {
 		return false
 	}
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.IP != nil && (input.IP == nil && *p.IP != *input.IP) {
+	if p.IP != nil && (input.IP == nil || *p.IP != *input.IP) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.LastSeen != nil && (input.LastSeen == nil && *p.LastSeen != *input.LastSeen) {
+	if p.LastSeen != nil && (input.LastSeen == nil || *p.LastSeen != *input.LastSeen) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.NodeId != nil && (input.NodeId == nil && *p.NodeId != *input.NodeId) {
+	if p.NodeId != nil && (input.NodeId == nil || *p.NodeId != *input.NodeId) {
 		return false
 	}
 
-	if p.RegistrationTime != nil && (input.RegistrationTime == nil && *p.RegistrationTime != *input.RegistrationTime) {
+	if p.RegistrationTime != nil && (input.RegistrationTime == nil || *p.RegistrationTime != *input.RegistrationTime) {
 		return false
 	}
 
-	if p.Status != nil && (input.Status == nil && *p.Status != *input.Status) {
+	if p.Status != nil && (input.Status == nil || *p.Status != *input.Status) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2015-10-31/dscnodeconfiguration/predicates.go b/resource-manager/automation/2015-10-31/dscnodeconfiguration/predicates.go
index adebed1440f..988a6edd06b 100644
--- a/resource-manager/automation/2015-10-31/dscnodeconfiguration/predicates.go
+++ b/resource-manager/automation/2015-10-31/dscnodeconfiguration/predicates.go
@@ -13,23 +13,23 @@ type DscNodeConfigurationOperationPredicate struct {
 
 func (p DscNodeConfigurationOperationPredicate) Matches(input DscNodeConfiguration) bool {
 
-	if p.CreationTime != nil && (input.CreationTime == nil && *p.CreationTime != *input.CreationTime) {
+	if p.CreationTime != nil && (input.CreationTime == nil || *p.CreationTime != *input.CreationTime) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.LastModifiedTime != nil && (input.LastModifiedTime == nil && *p.LastModifiedTime != *input.LastModifiedTime) {
+	if p.LastModifiedTime != nil && (input.LastModifiedTime == nil || *p.LastModifiedTime != *input.LastModifiedTime) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2015-10-31/hybridrunbookworkergroup/predicates.go b/resource-manager/automation/2015-10-31/hybridrunbookworkergroup/predicates.go
index 4deac97a518..640f1367cc3 100644
--- a/resource-manager/automation/2015-10-31/hybridrunbookworkergroup/predicates.go
+++ b/resource-manager/automation/2015-10-31/hybridrunbookworkergroup/predicates.go
@@ -10,11 +10,11 @@ type HybridRunbookWorkerGroupOperationPredicate struct {
 
 func (p HybridRunbookWorkerGroupOperationPredicate) Matches(input HybridRunbookWorkerGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2015-10-31/job/predicates.go b/resource-manager/automation/2015-10-31/job/predicates.go
index 0e6c5fcc60d..a1d80d9e135 100644
--- a/resource-manager/automation/2015-10-31/job/predicates.go
+++ b/resource-manager/automation/2015-10-31/job/predicates.go
@@ -9,7 +9,7 @@ type JobOperationPredicate struct {
 
 func (p JobOperationPredicate) Matches(input Job) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2015-10-31/jobschedule/predicates.go b/resource-manager/automation/2015-10-31/jobschedule/predicates.go
index 7b385447f67..55d6ea9274b 100644
--- a/resource-manager/automation/2015-10-31/jobschedule/predicates.go
+++ b/resource-manager/automation/2015-10-31/jobschedule/predicates.go
@@ -11,15 +11,15 @@ type JobScheduleOperationPredicate struct {
 
 func (p JobScheduleOperationPredicate) Matches(input JobSchedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2015-10-31/jobstream/predicates.go b/resource-manager/automation/2015-10-31/jobstream/predicates.go
index 4ab3d6668c3..2efb3ab546c 100644
--- a/resource-manager/automation/2015-10-31/jobstream/predicates.go
+++ b/resource-manager/automation/2015-10-31/jobstream/predicates.go
@@ -9,7 +9,7 @@ type JobStreamOperationPredicate struct {
 
 func (p JobStreamOperationPredicate) Matches(input JobStream) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2015-10-31/module/predicates.go b/resource-manager/automation/2015-10-31/module/predicates.go
index fb9cbf48105..8d01d3c9451 100644
--- a/resource-manager/automation/2015-10-31/module/predicates.go
+++ b/resource-manager/automation/2015-10-31/module/predicates.go
@@ -13,23 +13,23 @@ type ModuleOperationPredicate struct {
 
 func (p ModuleOperationPredicate) Matches(input Module) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2015-10-31/nodereports/predicates.go b/resource-manager/automation/2015-10-31/nodereports/predicates.go
index 3e3a7a229f8..e0778e56813 100644
--- a/resource-manager/automation/2015-10-31/nodereports/predicates.go
+++ b/resource-manager/automation/2015-10-31/nodereports/predicates.go
@@ -22,59 +22,59 @@ type DscNodeReportOperationPredicate struct {
 
 func (p DscNodeReportOperationPredicate) Matches(input DscNodeReport) bool {
 
-	if p.ConfigurationVersion != nil && (input.ConfigurationVersion == nil && *p.ConfigurationVersion != *input.ConfigurationVersion) {
+	if p.ConfigurationVersion != nil && (input.ConfigurationVersion == nil || *p.ConfigurationVersion != *input.ConfigurationVersion) {
 		return false
 	}
 
-	if p.EndTime != nil && (input.EndTime == nil && *p.EndTime != *input.EndTime) {
+	if p.EndTime != nil && (input.EndTime == nil || *p.EndTime != *input.EndTime) {
 		return false
 	}
 
-	if p.HostName != nil && (input.HostName == nil && *p.HostName != *input.HostName) {
+	if p.HostName != nil && (input.HostName == nil || *p.HostName != *input.HostName) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.LastModifiedTime != nil && (input.LastModifiedTime == nil && *p.LastModifiedTime != *input.LastModifiedTime) {
+	if p.LastModifiedTime != nil && (input.LastModifiedTime == nil || *p.LastModifiedTime != *input.LastModifiedTime) {
 		return false
 	}
 
-	if p.NumberOfResources != nil && (input.NumberOfResources == nil && *p.NumberOfResources != *input.NumberOfResources) {
+	if p.NumberOfResources != nil && (input.NumberOfResources == nil || *p.NumberOfResources != *input.NumberOfResources) {
 		return false
 	}
 
-	if p.RawErrors != nil && (input.RawErrors == nil && *p.RawErrors != *input.RawErrors) {
+	if p.RawErrors != nil && (input.RawErrors == nil || *p.RawErrors != *input.RawErrors) {
 		return false
 	}
 
-	if p.RebootRequested != nil && (input.RebootRequested == nil && *p.RebootRequested != *input.RebootRequested) {
+	if p.RebootRequested != nil && (input.RebootRequested == nil || *p.RebootRequested != *input.RebootRequested) {
 		return false
 	}
 
-	if p.RefreshMode != nil && (input.RefreshMode == nil && *p.RefreshMode != *input.RefreshMode) {
+	if p.RefreshMode != nil && (input.RefreshMode == nil || *p.RefreshMode != *input.RefreshMode) {
 		return false
 	}
 
-	if p.ReportFormatVersion != nil && (input.ReportFormatVersion == nil && *p.ReportFormatVersion != *input.ReportFormatVersion) {
+	if p.ReportFormatVersion != nil && (input.ReportFormatVersion == nil || *p.ReportFormatVersion != *input.ReportFormatVersion) {
 		return false
 	}
 
-	if p.ReportId != nil && (input.ReportId == nil && *p.ReportId != *input.ReportId) {
+	if p.ReportId != nil && (input.ReportId == nil || *p.ReportId != *input.ReportId) {
 		return false
 	}
 
-	if p.StartTime != nil && (input.StartTime == nil && *p.StartTime != *input.StartTime) {
+	if p.StartTime != nil && (input.StartTime == nil || *p.StartTime != *input.StartTime) {
 		return false
 	}
 
-	if p.Status != nil && (input.Status == nil && *p.Status != *input.Status) {
+	if p.Status != nil && (input.Status == nil || *p.Status != *input.Status) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2015-10-31/runbook/predicates.go b/resource-manager/automation/2015-10-31/runbook/predicates.go
index be9b778ec35..cc576c7b42f 100644
--- a/resource-manager/automation/2015-10-31/runbook/predicates.go
+++ b/resource-manager/automation/2015-10-31/runbook/predicates.go
@@ -13,23 +13,23 @@ type RunbookOperationPredicate struct {
 
 func (p RunbookOperationPredicate) Matches(input Runbook) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2015-10-31/schedule/predicates.go b/resource-manager/automation/2015-10-31/schedule/predicates.go
index 429a38a6a3c..77fa3780f49 100644
--- a/resource-manager/automation/2015-10-31/schedule/predicates.go
+++ b/resource-manager/automation/2015-10-31/schedule/predicates.go
@@ -11,15 +11,15 @@ type ScheduleOperationPredicate struct {
 
 func (p ScheduleOperationPredicate) Matches(input Schedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2015-10-31/testjobstream/predicates.go b/resource-manager/automation/2015-10-31/testjobstream/predicates.go
index b6b17c0ef04..15b9ad787f0 100644
--- a/resource-manager/automation/2015-10-31/testjobstream/predicates.go
+++ b/resource-manager/automation/2015-10-31/testjobstream/predicates.go
@@ -9,7 +9,7 @@ type JobStreamOperationPredicate struct {
 
 func (p JobStreamOperationPredicate) Matches(input JobStream) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2015-10-31/variable/predicates.go b/resource-manager/automation/2015-10-31/variable/predicates.go
index 7e1018f0f61..45c96d19a6c 100644
--- a/resource-manager/automation/2015-10-31/variable/predicates.go
+++ b/resource-manager/automation/2015-10-31/variable/predicates.go
@@ -11,15 +11,15 @@ type VariableOperationPredicate struct {
 
 func (p VariableOperationPredicate) Matches(input Variable) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2015-10-31/watcher/predicates.go b/resource-manager/automation/2015-10-31/watcher/predicates.go
index b2f67a4851b..60207280a44 100644
--- a/resource-manager/automation/2015-10-31/watcher/predicates.go
+++ b/resource-manager/automation/2015-10-31/watcher/predicates.go
@@ -13,23 +13,23 @@ type WatcherOperationPredicate struct {
 
 func (p WatcherOperationPredicate) Matches(input Watcher) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2015-10-31/webhook/predicates.go b/resource-manager/automation/2015-10-31/webhook/predicates.go
index 865668745f4..84be365e121 100644
--- a/resource-manager/automation/2015-10-31/webhook/predicates.go
+++ b/resource-manager/automation/2015-10-31/webhook/predicates.go
@@ -11,15 +11,15 @@ type WebhookOperationPredicate struct {
 
 func (p WebhookOperationPredicate) Matches(input Webhook) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/activity/predicates.go b/resource-manager/automation/2019-06-01/activity/predicates.go
index 4e496e3559c..8e0d9fda208 100644
--- a/resource-manager/automation/2019-06-01/activity/predicates.go
+++ b/resource-manager/automation/2019-06-01/activity/predicates.go
@@ -10,11 +10,11 @@ type ActivityOperationPredicate struct {
 
 func (p ActivityOperationPredicate) Matches(input Activity) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/automationaccount/predicates.go b/resource-manager/automation/2019-06-01/automationaccount/predicates.go
index cc203c92b2c..0e3e0289b53 100644
--- a/resource-manager/automation/2019-06-01/automationaccount/predicates.go
+++ b/resource-manager/automation/2019-06-01/automationaccount/predicates.go
@@ -13,23 +13,23 @@ type AutomationAccountOperationPredicate struct {
 
 func (p AutomationAccountOperationPredicate) Matches(input AutomationAccount) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/certificate/predicates.go b/resource-manager/automation/2019-06-01/certificate/predicates.go
index 4aedc2944c2..e5348ea1cb4 100644
--- a/resource-manager/automation/2019-06-01/certificate/predicates.go
+++ b/resource-manager/automation/2019-06-01/certificate/predicates.go
@@ -11,15 +11,15 @@ type CertificateOperationPredicate struct {
 
 func (p CertificateOperationPredicate) Matches(input Certificate) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/connection/predicates.go b/resource-manager/automation/2019-06-01/connection/predicates.go
index b5a1ef66014..3fce88c9236 100644
--- a/resource-manager/automation/2019-06-01/connection/predicates.go
+++ b/resource-manager/automation/2019-06-01/connection/predicates.go
@@ -11,15 +11,15 @@ type ConnectionOperationPredicate struct {
 
 func (p ConnectionOperationPredicate) Matches(input Connection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/connectiontype/predicates.go b/resource-manager/automation/2019-06-01/connectiontype/predicates.go
index 563732498c8..f7d23543367 100644
--- a/resource-manager/automation/2019-06-01/connectiontype/predicates.go
+++ b/resource-manager/automation/2019-06-01/connectiontype/predicates.go
@@ -11,15 +11,15 @@ type ConnectionTypeOperationPredicate struct {
 
 func (p ConnectionTypeOperationPredicate) Matches(input ConnectionType) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/credential/predicates.go b/resource-manager/automation/2019-06-01/credential/predicates.go
index 3fe342bcab8..35c2d317a4c 100644
--- a/resource-manager/automation/2019-06-01/credential/predicates.go
+++ b/resource-manager/automation/2019-06-01/credential/predicates.go
@@ -11,15 +11,15 @@ type CredentialOperationPredicate struct {
 
 func (p CredentialOperationPredicate) Matches(input Credential) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/dsccompilationjob/predicates.go b/resource-manager/automation/2019-06-01/dsccompilationjob/predicates.go
index 318310114c2..3c4d40fe918 100644
--- a/resource-manager/automation/2019-06-01/dsccompilationjob/predicates.go
+++ b/resource-manager/automation/2019-06-01/dsccompilationjob/predicates.go
@@ -11,15 +11,15 @@ type DscCompilationJobOperationPredicate struct {
 
 func (p DscCompilationJobOperationPredicate) Matches(input DscCompilationJob) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/dscconfiguration/predicates.go b/resource-manager/automation/2019-06-01/dscconfiguration/predicates.go
index 85d117369b5..f90f04bdbe1 100644
--- a/resource-manager/automation/2019-06-01/dscconfiguration/predicates.go
+++ b/resource-manager/automation/2019-06-01/dscconfiguration/predicates.go
@@ -13,23 +13,23 @@ type DscConfigurationOperationPredicate struct {
 
 func (p DscConfigurationOperationPredicate) Matches(input DscConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/dscnode/predicates.go b/resource-manager/automation/2019-06-01/dscnode/predicates.go
index 245f83ec3ad..6f1c5f8a044 100644
--- a/resource-manager/automation/2019-06-01/dscnode/predicates.go
+++ b/resource-manager/automation/2019-06-01/dscnode/predicates.go
@@ -11,15 +11,15 @@ type DscNodeOperationPredicate struct {
 
 func (p DscNodeOperationPredicate) Matches(input DscNode) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/dscnodeconfiguration/predicates.go b/resource-manager/automation/2019-06-01/dscnodeconfiguration/predicates.go
index 602416727a6..efe7a89bae7 100644
--- a/resource-manager/automation/2019-06-01/dscnodeconfiguration/predicates.go
+++ b/resource-manager/automation/2019-06-01/dscnodeconfiguration/predicates.go
@@ -11,15 +11,15 @@ type DscNodeConfigurationOperationPredicate struct {
 
 func (p DscNodeConfigurationOperationPredicate) Matches(input DscNodeConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/hybridrunbookworkergroup/predicates.go b/resource-manager/automation/2019-06-01/hybridrunbookworkergroup/predicates.go
index 4deac97a518..640f1367cc3 100644
--- a/resource-manager/automation/2019-06-01/hybridrunbookworkergroup/predicates.go
+++ b/resource-manager/automation/2019-06-01/hybridrunbookworkergroup/predicates.go
@@ -10,11 +10,11 @@ type HybridRunbookWorkerGroupOperationPredicate struct {
 
 func (p HybridRunbookWorkerGroupOperationPredicate) Matches(input HybridRunbookWorkerGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/job/predicates.go b/resource-manager/automation/2019-06-01/job/predicates.go
index f863e740970..91845f0c164 100644
--- a/resource-manager/automation/2019-06-01/job/predicates.go
+++ b/resource-manager/automation/2019-06-01/job/predicates.go
@@ -11,15 +11,15 @@ type JobCollectionItemOperationPredicate struct {
 
 func (p JobCollectionItemOperationPredicate) Matches(input JobCollectionItem) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/jobschedule/predicates.go b/resource-manager/automation/2019-06-01/jobschedule/predicates.go
index 7b385447f67..55d6ea9274b 100644
--- a/resource-manager/automation/2019-06-01/jobschedule/predicates.go
+++ b/resource-manager/automation/2019-06-01/jobschedule/predicates.go
@@ -11,15 +11,15 @@ type JobScheduleOperationPredicate struct {
 
 func (p JobScheduleOperationPredicate) Matches(input JobSchedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/jobstream/predicates.go b/resource-manager/automation/2019-06-01/jobstream/predicates.go
index 4ab3d6668c3..2efb3ab546c 100644
--- a/resource-manager/automation/2019-06-01/jobstream/predicates.go
+++ b/resource-manager/automation/2019-06-01/jobstream/predicates.go
@@ -9,7 +9,7 @@ type JobStreamOperationPredicate struct {
 
 func (p JobStreamOperationPredicate) Matches(input JobStream) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/module/predicates.go b/resource-manager/automation/2019-06-01/module/predicates.go
index fb9cbf48105..8d01d3c9451 100644
--- a/resource-manager/automation/2019-06-01/module/predicates.go
+++ b/resource-manager/automation/2019-06-01/module/predicates.go
@@ -13,23 +13,23 @@ type ModuleOperationPredicate struct {
 
 func (p ModuleOperationPredicate) Matches(input Module) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/nodereports/predicates.go b/resource-manager/automation/2019-06-01/nodereports/predicates.go
index 3e3a7a229f8..e0778e56813 100644
--- a/resource-manager/automation/2019-06-01/nodereports/predicates.go
+++ b/resource-manager/automation/2019-06-01/nodereports/predicates.go
@@ -22,59 +22,59 @@ type DscNodeReportOperationPredicate struct {
 
 func (p DscNodeReportOperationPredicate) Matches(input DscNodeReport) bool {
 
-	if p.ConfigurationVersion != nil && (input.ConfigurationVersion == nil && *p.ConfigurationVersion != *input.ConfigurationVersion) {
+	if p.ConfigurationVersion != nil && (input.ConfigurationVersion == nil || *p.ConfigurationVersion != *input.ConfigurationVersion) {
 		return false
 	}
 
-	if p.EndTime != nil && (input.EndTime == nil && *p.EndTime != *input.EndTime) {
+	if p.EndTime != nil && (input.EndTime == nil || *p.EndTime != *input.EndTime) {
 		return false
 	}
 
-	if p.HostName != nil && (input.HostName == nil && *p.HostName != *input.HostName) {
+	if p.HostName != nil && (input.HostName == nil || *p.HostName != *input.HostName) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.LastModifiedTime != nil && (input.LastModifiedTime == nil && *p.LastModifiedTime != *input.LastModifiedTime) {
+	if p.LastModifiedTime != nil && (input.LastModifiedTime == nil || *p.LastModifiedTime != *input.LastModifiedTime) {
 		return false
 	}
 
-	if p.NumberOfResources != nil && (input.NumberOfResources == nil && *p.NumberOfResources != *input.NumberOfResources) {
+	if p.NumberOfResources != nil && (input.NumberOfResources == nil || *p.NumberOfResources != *input.NumberOfResources) {
 		return false
 	}
 
-	if p.RawErrors != nil && (input.RawErrors == nil && *p.RawErrors != *input.RawErrors) {
+	if p.RawErrors != nil && (input.RawErrors == nil || *p.RawErrors != *input.RawErrors) {
 		return false
 	}
 
-	if p.RebootRequested != nil && (input.RebootRequested == nil && *p.RebootRequested != *input.RebootRequested) {
+	if p.RebootRequested != nil && (input.RebootRequested == nil || *p.RebootRequested != *input.RebootRequested) {
 		return false
 	}
 
-	if p.RefreshMode != nil && (input.RefreshMode == nil && *p.RefreshMode != *input.RefreshMode) {
+	if p.RefreshMode != nil && (input.RefreshMode == nil || *p.RefreshMode != *input.RefreshMode) {
 		return false
 	}
 
-	if p.ReportFormatVersion != nil && (input.ReportFormatVersion == nil && *p.ReportFormatVersion != *input.ReportFormatVersion) {
+	if p.ReportFormatVersion != nil && (input.ReportFormatVersion == nil || *p.ReportFormatVersion != *input.ReportFormatVersion) {
 		return false
 	}
 
-	if p.ReportId != nil && (input.ReportId == nil && *p.ReportId != *input.ReportId) {
+	if p.ReportId != nil && (input.ReportId == nil || *p.ReportId != *input.ReportId) {
 		return false
 	}
 
-	if p.StartTime != nil && (input.StartTime == nil && *p.StartTime != *input.StartTime) {
+	if p.StartTime != nil && (input.StartTime == nil || *p.StartTime != *input.StartTime) {
 		return false
 	}
 
-	if p.Status != nil && (input.Status == nil && *p.Status != *input.Status) {
+	if p.Status != nil && (input.Status == nil || *p.Status != *input.Status) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/python2package/predicates.go b/resource-manager/automation/2019-06-01/python2package/predicates.go
index 6301bd45fe5..12dda736df2 100644
--- a/resource-manager/automation/2019-06-01/python2package/predicates.go
+++ b/resource-manager/automation/2019-06-01/python2package/predicates.go
@@ -13,23 +13,23 @@ type ModuleOperationPredicate struct {
 
 func (p ModuleOperationPredicate) Matches(input Module) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/runbook/predicates.go b/resource-manager/automation/2019-06-01/runbook/predicates.go
index be9b778ec35..cc576c7b42f 100644
--- a/resource-manager/automation/2019-06-01/runbook/predicates.go
+++ b/resource-manager/automation/2019-06-01/runbook/predicates.go
@@ -13,23 +13,23 @@ type RunbookOperationPredicate struct {
 
 func (p RunbookOperationPredicate) Matches(input Runbook) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/schedule/predicates.go b/resource-manager/automation/2019-06-01/schedule/predicates.go
index 429a38a6a3c..77fa3780f49 100644
--- a/resource-manager/automation/2019-06-01/schedule/predicates.go
+++ b/resource-manager/automation/2019-06-01/schedule/predicates.go
@@ -11,15 +11,15 @@ type ScheduleOperationPredicate struct {
 
 func (p ScheduleOperationPredicate) Matches(input Schedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/sourcecontrol/predicates.go b/resource-manager/automation/2019-06-01/sourcecontrol/predicates.go
index 692553ffd0d..fe6e2ba4230 100644
--- a/resource-manager/automation/2019-06-01/sourcecontrol/predicates.go
+++ b/resource-manager/automation/2019-06-01/sourcecontrol/predicates.go
@@ -11,15 +11,15 @@ type SourceControlOperationPredicate struct {
 
 func (p SourceControlOperationPredicate) Matches(input SourceControl) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/sourcecontrolsyncjob/predicates.go b/resource-manager/automation/2019-06-01/sourcecontrolsyncjob/predicates.go
index f22c02f80a4..3f9ee7d46ae 100644
--- a/resource-manager/automation/2019-06-01/sourcecontrolsyncjob/predicates.go
+++ b/resource-manager/automation/2019-06-01/sourcecontrolsyncjob/predicates.go
@@ -11,15 +11,15 @@ type SourceControlSyncJobOperationPredicate struct {
 
 func (p SourceControlSyncJobOperationPredicate) Matches(input SourceControlSyncJob) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/sourcecontrolsyncjobstreams/predicates.go b/resource-manager/automation/2019-06-01/sourcecontrolsyncjobstreams/predicates.go
index 6ab30e2dcca..0ec43ded1f9 100644
--- a/resource-manager/automation/2019-06-01/sourcecontrolsyncjobstreams/predicates.go
+++ b/resource-manager/automation/2019-06-01/sourcecontrolsyncjobstreams/predicates.go
@@ -9,7 +9,7 @@ type SourceControlSyncJobStreamOperationPredicate struct {
 
 func (p SourceControlSyncJobStreamOperationPredicate) Matches(input SourceControlSyncJobStream) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/testjobstream/predicates.go b/resource-manager/automation/2019-06-01/testjobstream/predicates.go
index b6b17c0ef04..15b9ad787f0 100644
--- a/resource-manager/automation/2019-06-01/testjobstream/predicates.go
+++ b/resource-manager/automation/2019-06-01/testjobstream/predicates.go
@@ -9,7 +9,7 @@ type JobStreamOperationPredicate struct {
 
 func (p JobStreamOperationPredicate) Matches(input JobStream) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/variable/predicates.go b/resource-manager/automation/2019-06-01/variable/predicates.go
index 7e1018f0f61..45c96d19a6c 100644
--- a/resource-manager/automation/2019-06-01/variable/predicates.go
+++ b/resource-manager/automation/2019-06-01/variable/predicates.go
@@ -11,15 +11,15 @@ type VariableOperationPredicate struct {
 
 func (p VariableOperationPredicate) Matches(input Variable) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2019-06-01/watcher/predicates.go b/resource-manager/automation/2019-06-01/watcher/predicates.go
index b2f67a4851b..60207280a44 100644
--- a/resource-manager/automation/2019-06-01/watcher/predicates.go
+++ b/resource-manager/automation/2019-06-01/watcher/predicates.go
@@ -13,23 +13,23 @@ type WatcherOperationPredicate struct {
 
 func (p WatcherOperationPredicate) Matches(input Watcher) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2020-01-13-preview/activity/predicates.go b/resource-manager/automation/2020-01-13-preview/activity/predicates.go
index 4e496e3559c..8e0d9fda208 100644
--- a/resource-manager/automation/2020-01-13-preview/activity/predicates.go
+++ b/resource-manager/automation/2020-01-13-preview/activity/predicates.go
@@ -10,11 +10,11 @@ type ActivityOperationPredicate struct {
 
 func (p ActivityOperationPredicate) Matches(input Activity) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2020-01-13-preview/automationaccount/predicates.go b/resource-manager/automation/2020-01-13-preview/automationaccount/predicates.go
index cc203c92b2c..0e3e0289b53 100644
--- a/resource-manager/automation/2020-01-13-preview/automationaccount/predicates.go
+++ b/resource-manager/automation/2020-01-13-preview/automationaccount/predicates.go
@@ -13,23 +13,23 @@ type AutomationAccountOperationPredicate struct {
 
 func (p AutomationAccountOperationPredicate) Matches(input AutomationAccount) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2020-01-13-preview/certificate/predicates.go b/resource-manager/automation/2020-01-13-preview/certificate/predicates.go
index 4aedc2944c2..e5348ea1cb4 100644
--- a/resource-manager/automation/2020-01-13-preview/certificate/predicates.go
+++ b/resource-manager/automation/2020-01-13-preview/certificate/predicates.go
@@ -11,15 +11,15 @@ type CertificateOperationPredicate struct {
 
 func (p CertificateOperationPredicate) Matches(input Certificate) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2020-01-13-preview/connection/predicates.go b/resource-manager/automation/2020-01-13-preview/connection/predicates.go
index b5a1ef66014..3fce88c9236 100644
--- a/resource-manager/automation/2020-01-13-preview/connection/predicates.go
+++ b/resource-manager/automation/2020-01-13-preview/connection/predicates.go
@@ -11,15 +11,15 @@ type ConnectionOperationPredicate struct {
 
 func (p ConnectionOperationPredicate) Matches(input Connection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2020-01-13-preview/connectiontype/predicates.go b/resource-manager/automation/2020-01-13-preview/connectiontype/predicates.go
index 563732498c8..f7d23543367 100644
--- a/resource-manager/automation/2020-01-13-preview/connectiontype/predicates.go
+++ b/resource-manager/automation/2020-01-13-preview/connectiontype/predicates.go
@@ -11,15 +11,15 @@ type ConnectionTypeOperationPredicate struct {
 
 func (p ConnectionTypeOperationPredicate) Matches(input ConnectionType) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2020-01-13-preview/credential/predicates.go b/resource-manager/automation/2020-01-13-preview/credential/predicates.go
index 3fe342bcab8..35c2d317a4c 100644
--- a/resource-manager/automation/2020-01-13-preview/credential/predicates.go
+++ b/resource-manager/automation/2020-01-13-preview/credential/predicates.go
@@ -11,15 +11,15 @@ type CredentialOperationPredicate struct {
 
 func (p CredentialOperationPredicate) Matches(input Credential) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2020-01-13-preview/dsccompilationjob/predicates.go b/resource-manager/automation/2020-01-13-preview/dsccompilationjob/predicates.go
index 318310114c2..3c4d40fe918 100644
--- a/resource-manager/automation/2020-01-13-preview/dsccompilationjob/predicates.go
+++ b/resource-manager/automation/2020-01-13-preview/dsccompilationjob/predicates.go
@@ -11,15 +11,15 @@ type DscCompilationJobOperationPredicate struct {
 
 func (p DscCompilationJobOperationPredicate) Matches(input DscCompilationJob) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2020-01-13-preview/dscnode/predicates.go b/resource-manager/automation/2020-01-13-preview/dscnode/predicates.go
index 245f83ec3ad..6f1c5f8a044 100644
--- a/resource-manager/automation/2020-01-13-preview/dscnode/predicates.go
+++ b/resource-manager/automation/2020-01-13-preview/dscnode/predicates.go
@@ -11,15 +11,15 @@ type DscNodeOperationPredicate struct {
 
 func (p DscNodeOperationPredicate) Matches(input DscNode) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2020-01-13-preview/dscnodeconfiguration/predicates.go b/resource-manager/automation/2020-01-13-preview/dscnodeconfiguration/predicates.go
index 602416727a6..efe7a89bae7 100644
--- a/resource-manager/automation/2020-01-13-preview/dscnodeconfiguration/predicates.go
+++ b/resource-manager/automation/2020-01-13-preview/dscnodeconfiguration/predicates.go
@@ -11,15 +11,15 @@ type DscNodeConfigurationOperationPredicate struct {
 
 func (p DscNodeConfigurationOperationPredicate) Matches(input DscNodeConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2020-01-13-preview/hybridrunbookworkergroup/predicates.go b/resource-manager/automation/2020-01-13-preview/hybridrunbookworkergroup/predicates.go
index 4deac97a518..640f1367cc3 100644
--- a/resource-manager/automation/2020-01-13-preview/hybridrunbookworkergroup/predicates.go
+++ b/resource-manager/automation/2020-01-13-preview/hybridrunbookworkergroup/predicates.go
@@ -10,11 +10,11 @@ type HybridRunbookWorkerGroupOperationPredicate struct {
 
 func (p HybridRunbookWorkerGroupOperationPredicate) Matches(input HybridRunbookWorkerGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2020-01-13-preview/jobschedule/predicates.go b/resource-manager/automation/2020-01-13-preview/jobschedule/predicates.go
index 7b385447f67..55d6ea9274b 100644
--- a/resource-manager/automation/2020-01-13-preview/jobschedule/predicates.go
+++ b/resource-manager/automation/2020-01-13-preview/jobschedule/predicates.go
@@ -11,15 +11,15 @@ type JobScheduleOperationPredicate struct {
 
 func (p JobScheduleOperationPredicate) Matches(input JobSchedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2020-01-13-preview/module/predicates.go b/resource-manager/automation/2020-01-13-preview/module/predicates.go
index fb9cbf48105..8d01d3c9451 100644
--- a/resource-manager/automation/2020-01-13-preview/module/predicates.go
+++ b/resource-manager/automation/2020-01-13-preview/module/predicates.go
@@ -13,23 +13,23 @@ type ModuleOperationPredicate struct {
 
 func (p ModuleOperationPredicate) Matches(input Module) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2020-01-13-preview/nodereports/predicates.go b/resource-manager/automation/2020-01-13-preview/nodereports/predicates.go
index 3e3a7a229f8..e0778e56813 100644
--- a/resource-manager/automation/2020-01-13-preview/nodereports/predicates.go
+++ b/resource-manager/automation/2020-01-13-preview/nodereports/predicates.go
@@ -22,59 +22,59 @@ type DscNodeReportOperationPredicate struct {
 
 func (p DscNodeReportOperationPredicate) Matches(input DscNodeReport) bool {
 
-	if p.ConfigurationVersion != nil && (input.ConfigurationVersion == nil && *p.ConfigurationVersion != *input.ConfigurationVersion) {
+	if p.ConfigurationVersion != nil && (input.ConfigurationVersion == nil || *p.ConfigurationVersion != *input.ConfigurationVersion) {
 		return false
 	}
 
-	if p.EndTime != nil && (input.EndTime == nil && *p.EndTime != *input.EndTime) {
+	if p.EndTime != nil && (input.EndTime == nil || *p.EndTime != *input.EndTime) {
 		return false
 	}
 
-	if p.HostName != nil && (input.HostName == nil && *p.HostName != *input.HostName) {
+	if p.HostName != nil && (input.HostName == nil || *p.HostName != *input.HostName) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.LastModifiedTime != nil && (input.LastModifiedTime == nil && *p.LastModifiedTime != *input.LastModifiedTime) {
+	if p.LastModifiedTime != nil && (input.LastModifiedTime == nil || *p.LastModifiedTime != *input.LastModifiedTime) {
 		return false
 	}
 
-	if p.NumberOfResources != nil && (input.NumberOfResources == nil && *p.NumberOfResources != *input.NumberOfResources) {
+	if p.NumberOfResources != nil && (input.NumberOfResources == nil || *p.NumberOfResources != *input.NumberOfResources) {
 		return false
 	}
 
-	if p.RawErrors != nil && (input.RawErrors == nil && *p.RawErrors != *input.RawErrors) {
+	if p.RawErrors != nil && (input.RawErrors == nil || *p.RawErrors != *input.RawErrors) {
 		return false
 	}
 
-	if p.RebootRequested != nil && (input.RebootRequested == nil && *p.RebootRequested != *input.RebootRequested) {
+	if p.RebootRequested != nil && (input.RebootRequested == nil || *p.RebootRequested != *input.RebootRequested) {
 		return false
 	}
 
-	if p.RefreshMode != nil && (input.RefreshMode == nil && *p.RefreshMode != *input.RefreshMode) {
+	if p.RefreshMode != nil && (input.RefreshMode == nil || *p.RefreshMode != *input.RefreshMode) {
 		return false
 	}
 
-	if p.ReportFormatVersion != nil && (input.ReportFormatVersion == nil && *p.ReportFormatVersion != *input.ReportFormatVersion) {
+	if p.ReportFormatVersion != nil && (input.ReportFormatVersion == nil || *p.ReportFormatVersion != *input.ReportFormatVersion) {
 		return false
 	}
 
-	if p.ReportId != nil && (input.ReportId == nil && *p.ReportId != *input.ReportId) {
+	if p.ReportId != nil && (input.ReportId == nil || *p.ReportId != *input.ReportId) {
 		return false
 	}
 
-	if p.StartTime != nil && (input.StartTime == nil && *p.StartTime != *input.StartTime) {
+	if p.StartTime != nil && (input.StartTime == nil || *p.StartTime != *input.StartTime) {
 		return false
 	}
 
-	if p.Status != nil && (input.Status == nil && *p.Status != *input.Status) {
+	if p.Status != nil && (input.Status == nil || *p.Status != *input.Status) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2020-01-13-preview/python2package/predicates.go b/resource-manager/automation/2020-01-13-preview/python2package/predicates.go
index 6301bd45fe5..12dda736df2 100644
--- a/resource-manager/automation/2020-01-13-preview/python2package/predicates.go
+++ b/resource-manager/automation/2020-01-13-preview/python2package/predicates.go
@@ -13,23 +13,23 @@ type ModuleOperationPredicate struct {
 
 func (p ModuleOperationPredicate) Matches(input Module) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2020-01-13-preview/schedule/predicates.go b/resource-manager/automation/2020-01-13-preview/schedule/predicates.go
index 429a38a6a3c..77fa3780f49 100644
--- a/resource-manager/automation/2020-01-13-preview/schedule/predicates.go
+++ b/resource-manager/automation/2020-01-13-preview/schedule/predicates.go
@@ -11,15 +11,15 @@ type ScheduleOperationPredicate struct {
 
 func (p ScheduleOperationPredicate) Matches(input Schedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2020-01-13-preview/sourcecontrol/predicates.go b/resource-manager/automation/2020-01-13-preview/sourcecontrol/predicates.go
index 692553ffd0d..fe6e2ba4230 100644
--- a/resource-manager/automation/2020-01-13-preview/sourcecontrol/predicates.go
+++ b/resource-manager/automation/2020-01-13-preview/sourcecontrol/predicates.go
@@ -11,15 +11,15 @@ type SourceControlOperationPredicate struct {
 
 func (p SourceControlOperationPredicate) Matches(input SourceControl) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2020-01-13-preview/sourcecontrolsyncjob/predicates.go b/resource-manager/automation/2020-01-13-preview/sourcecontrolsyncjob/predicates.go
index f22c02f80a4..3f9ee7d46ae 100644
--- a/resource-manager/automation/2020-01-13-preview/sourcecontrolsyncjob/predicates.go
+++ b/resource-manager/automation/2020-01-13-preview/sourcecontrolsyncjob/predicates.go
@@ -11,15 +11,15 @@ type SourceControlSyncJobOperationPredicate struct {
 
 func (p SourceControlSyncJobOperationPredicate) Matches(input SourceControlSyncJob) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2020-01-13-preview/sourcecontrolsyncjobstreams/predicates.go b/resource-manager/automation/2020-01-13-preview/sourcecontrolsyncjobstreams/predicates.go
index 6ab30e2dcca..0ec43ded1f9 100644
--- a/resource-manager/automation/2020-01-13-preview/sourcecontrolsyncjobstreams/predicates.go
+++ b/resource-manager/automation/2020-01-13-preview/sourcecontrolsyncjobstreams/predicates.go
@@ -9,7 +9,7 @@ type SourceControlSyncJobStreamOperationPredicate struct {
 
 func (p SourceControlSyncJobStreamOperationPredicate) Matches(input SourceControlSyncJobStream) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2020-01-13-preview/variable/predicates.go b/resource-manager/automation/2020-01-13-preview/variable/predicates.go
index 7e1018f0f61..45c96d19a6c 100644
--- a/resource-manager/automation/2020-01-13-preview/variable/predicates.go
+++ b/resource-manager/automation/2020-01-13-preview/variable/predicates.go
@@ -11,15 +11,15 @@ type VariableOperationPredicate struct {
 
 func (p VariableOperationPredicate) Matches(input Variable) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2020-01-13-preview/watcher/predicates.go b/resource-manager/automation/2020-01-13-preview/watcher/predicates.go
index b2f67a4851b..60207280a44 100644
--- a/resource-manager/automation/2020-01-13-preview/watcher/predicates.go
+++ b/resource-manager/automation/2020-01-13-preview/watcher/predicates.go
@@ -13,23 +13,23 @@ type WatcherOperationPredicate struct {
 
 func (p WatcherOperationPredicate) Matches(input Watcher) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2021-06-22/automationaccount/predicates.go b/resource-manager/automation/2021-06-22/automationaccount/predicates.go
index cc203c92b2c..0e3e0289b53 100644
--- a/resource-manager/automation/2021-06-22/automationaccount/predicates.go
+++ b/resource-manager/automation/2021-06-22/automationaccount/predicates.go
@@ -13,23 +13,23 @@ type AutomationAccountOperationPredicate struct {
 
 func (p AutomationAccountOperationPredicate) Matches(input AutomationAccount) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2021-06-22/hybridrunbookworker/predicates.go b/resource-manager/automation/2021-06-22/hybridrunbookworker/predicates.go
index 663e44478fc..67c70284234 100644
--- a/resource-manager/automation/2021-06-22/hybridrunbookworker/predicates.go
+++ b/resource-manager/automation/2021-06-22/hybridrunbookworker/predicates.go
@@ -11,15 +11,15 @@ type HybridRunbookWorkerOperationPredicate struct {
 
 func (p HybridRunbookWorkerOperationPredicate) Matches(input HybridRunbookWorker) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2021-06-22/hybridrunbookworkergroup/predicates.go b/resource-manager/automation/2021-06-22/hybridrunbookworkergroup/predicates.go
index edd11b42405..72b02b335ef 100644
--- a/resource-manager/automation/2021-06-22/hybridrunbookworkergroup/predicates.go
+++ b/resource-manager/automation/2021-06-22/hybridrunbookworkergroup/predicates.go
@@ -11,15 +11,15 @@ type HybridRunbookWorkerGroupOperationPredicate struct {
 
 func (p HybridRunbookWorkerGroupOperationPredicate) Matches(input HybridRunbookWorkerGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/activity/predicates.go b/resource-manager/automation/2022-08-08/activity/predicates.go
index 4e496e3559c..8e0d9fda208 100644
--- a/resource-manager/automation/2022-08-08/activity/predicates.go
+++ b/resource-manager/automation/2022-08-08/activity/predicates.go
@@ -10,11 +10,11 @@ type ActivityOperationPredicate struct {
 
 func (p ActivityOperationPredicate) Matches(input Activity) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/automationaccount/predicates.go b/resource-manager/automation/2022-08-08/automationaccount/predicates.go
index cc203c92b2c..0e3e0289b53 100644
--- a/resource-manager/automation/2022-08-08/automationaccount/predicates.go
+++ b/resource-manager/automation/2022-08-08/automationaccount/predicates.go
@@ -13,23 +13,23 @@ type AutomationAccountOperationPredicate struct {
 
 func (p AutomationAccountOperationPredicate) Matches(input AutomationAccount) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/certificate/predicates.go b/resource-manager/automation/2022-08-08/certificate/predicates.go
index 4aedc2944c2..e5348ea1cb4 100644
--- a/resource-manager/automation/2022-08-08/certificate/predicates.go
+++ b/resource-manager/automation/2022-08-08/certificate/predicates.go
@@ -11,15 +11,15 @@ type CertificateOperationPredicate struct {
 
 func (p CertificateOperationPredicate) Matches(input Certificate) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/connection/predicates.go b/resource-manager/automation/2022-08-08/connection/predicates.go
index b5a1ef66014..3fce88c9236 100644
--- a/resource-manager/automation/2022-08-08/connection/predicates.go
+++ b/resource-manager/automation/2022-08-08/connection/predicates.go
@@ -11,15 +11,15 @@ type ConnectionOperationPredicate struct {
 
 func (p ConnectionOperationPredicate) Matches(input Connection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/connectiontype/predicates.go b/resource-manager/automation/2022-08-08/connectiontype/predicates.go
index 563732498c8..f7d23543367 100644
--- a/resource-manager/automation/2022-08-08/connectiontype/predicates.go
+++ b/resource-manager/automation/2022-08-08/connectiontype/predicates.go
@@ -11,15 +11,15 @@ type ConnectionTypeOperationPredicate struct {
 
 func (p ConnectionTypeOperationPredicate) Matches(input ConnectionType) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/credential/predicates.go b/resource-manager/automation/2022-08-08/credential/predicates.go
index 3fe342bcab8..35c2d317a4c 100644
--- a/resource-manager/automation/2022-08-08/credential/predicates.go
+++ b/resource-manager/automation/2022-08-08/credential/predicates.go
@@ -11,15 +11,15 @@ type CredentialOperationPredicate struct {
 
 func (p CredentialOperationPredicate) Matches(input Credential) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/dscconfiguration/predicates.go b/resource-manager/automation/2022-08-08/dscconfiguration/predicates.go
index 85d117369b5..f90f04bdbe1 100644
--- a/resource-manager/automation/2022-08-08/dscconfiguration/predicates.go
+++ b/resource-manager/automation/2022-08-08/dscconfiguration/predicates.go
@@ -13,23 +13,23 @@ type DscConfigurationOperationPredicate struct {
 
 func (p DscConfigurationOperationPredicate) Matches(input DscConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/dscnodeconfiguration/predicates.go b/resource-manager/automation/2022-08-08/dscnodeconfiguration/predicates.go
index 602416727a6..efe7a89bae7 100644
--- a/resource-manager/automation/2022-08-08/dscnodeconfiguration/predicates.go
+++ b/resource-manager/automation/2022-08-08/dscnodeconfiguration/predicates.go
@@ -11,15 +11,15 @@ type DscNodeConfigurationOperationPredicate struct {
 
 func (p DscNodeConfigurationOperationPredicate) Matches(input DscNodeConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/hybridrunbookworker/predicates.go b/resource-manager/automation/2022-08-08/hybridrunbookworker/predicates.go
index 663e44478fc..67c70284234 100644
--- a/resource-manager/automation/2022-08-08/hybridrunbookworker/predicates.go
+++ b/resource-manager/automation/2022-08-08/hybridrunbookworker/predicates.go
@@ -11,15 +11,15 @@ type HybridRunbookWorkerOperationPredicate struct {
 
 func (p HybridRunbookWorkerOperationPredicate) Matches(input HybridRunbookWorker) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/hybridrunbookworkergroup/predicates.go b/resource-manager/automation/2022-08-08/hybridrunbookworkergroup/predicates.go
index edd11b42405..72b02b335ef 100644
--- a/resource-manager/automation/2022-08-08/hybridrunbookworkergroup/predicates.go
+++ b/resource-manager/automation/2022-08-08/hybridrunbookworkergroup/predicates.go
@@ -11,15 +11,15 @@ type HybridRunbookWorkerGroupOperationPredicate struct {
 
 func (p HybridRunbookWorkerGroupOperationPredicate) Matches(input HybridRunbookWorkerGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/job/predicates.go b/resource-manager/automation/2022-08-08/job/predicates.go
index f863e740970..91845f0c164 100644
--- a/resource-manager/automation/2022-08-08/job/predicates.go
+++ b/resource-manager/automation/2022-08-08/job/predicates.go
@@ -11,15 +11,15 @@ type JobCollectionItemOperationPredicate struct {
 
 func (p JobCollectionItemOperationPredicate) Matches(input JobCollectionItem) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/jobschedule/predicates.go b/resource-manager/automation/2022-08-08/jobschedule/predicates.go
index 7b385447f67..55d6ea9274b 100644
--- a/resource-manager/automation/2022-08-08/jobschedule/predicates.go
+++ b/resource-manager/automation/2022-08-08/jobschedule/predicates.go
@@ -11,15 +11,15 @@ type JobScheduleOperationPredicate struct {
 
 func (p JobScheduleOperationPredicate) Matches(input JobSchedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/jobstream/predicates.go b/resource-manager/automation/2022-08-08/jobstream/predicates.go
index 4ab3d6668c3..2efb3ab546c 100644
--- a/resource-manager/automation/2022-08-08/jobstream/predicates.go
+++ b/resource-manager/automation/2022-08-08/jobstream/predicates.go
@@ -9,7 +9,7 @@ type JobStreamOperationPredicate struct {
 
 func (p JobStreamOperationPredicate) Matches(input JobStream) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/module/predicates.go b/resource-manager/automation/2022-08-08/module/predicates.go
index fb9cbf48105..8d01d3c9451 100644
--- a/resource-manager/automation/2022-08-08/module/predicates.go
+++ b/resource-manager/automation/2022-08-08/module/predicates.go
@@ -13,23 +13,23 @@ type ModuleOperationPredicate struct {
 
 func (p ModuleOperationPredicate) Matches(input Module) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/python2package/predicates.go b/resource-manager/automation/2022-08-08/python2package/predicates.go
index 6301bd45fe5..12dda736df2 100644
--- a/resource-manager/automation/2022-08-08/python2package/predicates.go
+++ b/resource-manager/automation/2022-08-08/python2package/predicates.go
@@ -13,23 +13,23 @@ type ModuleOperationPredicate struct {
 
 func (p ModuleOperationPredicate) Matches(input Module) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/python3package/predicates.go b/resource-manager/automation/2022-08-08/python3package/predicates.go
index a2653823cea..1bf02312816 100644
--- a/resource-manager/automation/2022-08-08/python3package/predicates.go
+++ b/resource-manager/automation/2022-08-08/python3package/predicates.go
@@ -13,23 +13,23 @@ type ModuleOperationPredicate struct {
 
 func (p ModuleOperationPredicate) Matches(input Module) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/runbook/predicates.go b/resource-manager/automation/2022-08-08/runbook/predicates.go
index be9b778ec35..cc576c7b42f 100644
--- a/resource-manager/automation/2022-08-08/runbook/predicates.go
+++ b/resource-manager/automation/2022-08-08/runbook/predicates.go
@@ -13,23 +13,23 @@ type RunbookOperationPredicate struct {
 
 func (p RunbookOperationPredicate) Matches(input Runbook) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/schedule/predicates.go b/resource-manager/automation/2022-08-08/schedule/predicates.go
index 429a38a6a3c..77fa3780f49 100644
--- a/resource-manager/automation/2022-08-08/schedule/predicates.go
+++ b/resource-manager/automation/2022-08-08/schedule/predicates.go
@@ -11,15 +11,15 @@ type ScheduleOperationPredicate struct {
 
 func (p ScheduleOperationPredicate) Matches(input Schedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/sourcecontrol/predicates.go b/resource-manager/automation/2022-08-08/sourcecontrol/predicates.go
index 692553ffd0d..fe6e2ba4230 100644
--- a/resource-manager/automation/2022-08-08/sourcecontrol/predicates.go
+++ b/resource-manager/automation/2022-08-08/sourcecontrol/predicates.go
@@ -11,15 +11,15 @@ type SourceControlOperationPredicate struct {
 
 func (p SourceControlOperationPredicate) Matches(input SourceControl) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/sourcecontrolsyncjob/predicates.go b/resource-manager/automation/2022-08-08/sourcecontrolsyncjob/predicates.go
index f22c02f80a4..3f9ee7d46ae 100644
--- a/resource-manager/automation/2022-08-08/sourcecontrolsyncjob/predicates.go
+++ b/resource-manager/automation/2022-08-08/sourcecontrolsyncjob/predicates.go
@@ -11,15 +11,15 @@ type SourceControlSyncJobOperationPredicate struct {
 
 func (p SourceControlSyncJobOperationPredicate) Matches(input SourceControlSyncJob) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/sourcecontrolsyncjobstreams/predicates.go b/resource-manager/automation/2022-08-08/sourcecontrolsyncjobstreams/predicates.go
index 6ab30e2dcca..0ec43ded1f9 100644
--- a/resource-manager/automation/2022-08-08/sourcecontrolsyncjobstreams/predicates.go
+++ b/resource-manager/automation/2022-08-08/sourcecontrolsyncjobstreams/predicates.go
@@ -9,7 +9,7 @@ type SourceControlSyncJobStreamOperationPredicate struct {
 
 func (p SourceControlSyncJobStreamOperationPredicate) Matches(input SourceControlSyncJobStream) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/testjobstream/predicates.go b/resource-manager/automation/2022-08-08/testjobstream/predicates.go
index b6b17c0ef04..15b9ad787f0 100644
--- a/resource-manager/automation/2022-08-08/testjobstream/predicates.go
+++ b/resource-manager/automation/2022-08-08/testjobstream/predicates.go
@@ -9,7 +9,7 @@ type JobStreamOperationPredicate struct {
 
 func (p JobStreamOperationPredicate) Matches(input JobStream) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
diff --git a/resource-manager/automation/2022-08-08/variable/predicates.go b/resource-manager/automation/2022-08-08/variable/predicates.go
index 7e1018f0f61..45c96d19a6c 100644
--- a/resource-manager/automation/2022-08-08/variable/predicates.go
+++ b/resource-manager/automation/2022-08-08/variable/predicates.go
@@ -11,15 +11,15 @@ type VariableOperationPredicate struct {
 
 func (p VariableOperationPredicate) Matches(input Variable) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/azureactivedirectory/2020-03-01/privateendpointconnections/predicates.go b/resource-manager/azureactivedirectory/2020-03-01/privateendpointconnections/predicates.go
index bea3f66b397..4a03a91ce52 100644
--- a/resource-manager/azureactivedirectory/2020-03-01/privateendpointconnections/predicates.go
+++ b/resource-manager/azureactivedirectory/2020-03-01/privateendpointconnections/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/azureactivedirectory/2020-03-01/privatelinkforazuread/predicates.go b/resource-manager/azureactivedirectory/2020-03-01/privatelinkforazuread/predicates.go
index daca4924f52..57a80f294c2 100644
--- a/resource-manager/azureactivedirectory/2020-03-01/privatelinkforazuread/predicates.go
+++ b/resource-manager/azureactivedirectory/2020-03-01/privatelinkforazuread/predicates.go
@@ -16,35 +16,35 @@ type PrivateLinkPolicyOperationPredicate struct {
 
 func (p PrivateLinkPolicyOperationPredicate) Matches(input PrivateLinkPolicy) bool {
 
-	if p.AllTenants != nil && (input.AllTenants == nil && *p.AllTenants != *input.AllTenants) {
+	if p.AllTenants != nil && (input.AllTenants == nil || *p.AllTenants != *input.AllTenants) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.OwnerTenantId != nil && (input.OwnerTenantId == nil && *p.OwnerTenantId != *input.OwnerTenantId) {
+	if p.OwnerTenantId != nil && (input.OwnerTenantId == nil || *p.OwnerTenantId != *input.OwnerTenantId) {
 		return false
 	}
 
-	if p.ResourceGroup != nil && (input.ResourceGroup == nil && *p.ResourceGroup != *input.ResourceGroup) {
+	if p.ResourceGroup != nil && (input.ResourceGroup == nil || *p.ResourceGroup != *input.ResourceGroup) {
 		return false
 	}
 
-	if p.ResourceName != nil && (input.ResourceName == nil && *p.ResourceName != *input.ResourceName) {
+	if p.ResourceName != nil && (input.ResourceName == nil || *p.ResourceName != *input.ResourceName) {
 		return false
 	}
 
-	if p.SubscriptionId != nil && (input.SubscriptionId == nil && *p.SubscriptionId != *input.SubscriptionId) {
+	if p.SubscriptionId != nil && (input.SubscriptionId == nil || *p.SubscriptionId != *input.SubscriptionId) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/azureactivedirectory/2020-03-01/privatelinkresources/predicates.go b/resource-manager/azureactivedirectory/2020-03-01/privatelinkresources/predicates.go
index 29d787f073a..19b771c3994 100644
--- a/resource-manager/azureactivedirectory/2020-03-01/privatelinkresources/predicates.go
+++ b/resource-manager/azureactivedirectory/2020-03-01/privatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/azurestackhci/2023-03-01/arcsettings/predicates.go b/resource-manager/azurestackhci/2023-03-01/arcsettings/predicates.go
index 689f4037767..98d1fe0a836 100644
--- a/resource-manager/azurestackhci/2023-03-01/arcsettings/predicates.go
+++ b/resource-manager/azurestackhci/2023-03-01/arcsettings/predicates.go
@@ -11,15 +11,15 @@ type ArcSettingOperationPredicate struct {
 
 func (p ArcSettingOperationPredicate) Matches(input ArcSetting) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/azurestackhci/2023-03-01/clusters/predicates.go b/resource-manager/azurestackhci/2023-03-01/clusters/predicates.go
index 7c9c4692854..cc13b7c6220 100644
--- a/resource-manager/azurestackhci/2023-03-01/clusters/predicates.go
+++ b/resource-manager/azurestackhci/2023-03-01/clusters/predicates.go
@@ -12,7 +12,7 @@ type ClusterOperationPredicate struct {
 
 func (p ClusterOperationPredicate) Matches(input Cluster) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ClusterOperationPredicate) Matches(input Cluster) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/azurestackhci/2023-03-01/extensions/predicates.go b/resource-manager/azurestackhci/2023-03-01/extensions/predicates.go
index d8252ea6286..41d2fee4d9b 100644
--- a/resource-manager/azurestackhci/2023-03-01/extensions/predicates.go
+++ b/resource-manager/azurestackhci/2023-03-01/extensions/predicates.go
@@ -11,15 +11,15 @@ type ExtensionOperationPredicate struct {
 
 func (p ExtensionOperationPredicate) Matches(input Extension) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/azurestackhci/2023-03-01/offers/predicates.go b/resource-manager/azurestackhci/2023-03-01/offers/predicates.go
index f0f5b748ac9..75da90fe272 100644
--- a/resource-manager/azurestackhci/2023-03-01/offers/predicates.go
+++ b/resource-manager/azurestackhci/2023-03-01/offers/predicates.go
@@ -11,15 +11,15 @@ type OfferOperationPredicate struct {
 
 func (p OfferOperationPredicate) Matches(input Offer) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/azurestackhci/2023-03-01/publishers/predicates.go b/resource-manager/azurestackhci/2023-03-01/publishers/predicates.go
index 17f3285ea81..efccddd2512 100644
--- a/resource-manager/azurestackhci/2023-03-01/publishers/predicates.go
+++ b/resource-manager/azurestackhci/2023-03-01/publishers/predicates.go
@@ -11,15 +11,15 @@ type PublisherOperationPredicate struct {
 
 func (p PublisherOperationPredicate) Matches(input Publisher) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/azurestackhci/2023-03-01/skuses/predicates.go b/resource-manager/azurestackhci/2023-03-01/skuses/predicates.go
index b0d91abaa30..77c587da8fa 100644
--- a/resource-manager/azurestackhci/2023-03-01/skuses/predicates.go
+++ b/resource-manager/azurestackhci/2023-03-01/skuses/predicates.go
@@ -11,15 +11,15 @@ type SkuOperationPredicate struct {
 
 func (p SkuOperationPredicate) Matches(input Sku) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/azurestackhci/2023-03-01/updateruns/predicates.go b/resource-manager/azurestackhci/2023-03-01/updateruns/predicates.go
index 2db18769c3a..3634b9136ba 100644
--- a/resource-manager/azurestackhci/2023-03-01/updateruns/predicates.go
+++ b/resource-manager/azurestackhci/2023-03-01/updateruns/predicates.go
@@ -12,19 +12,19 @@ type UpdateRunOperationPredicate struct {
 
 func (p UpdateRunOperationPredicate) Matches(input UpdateRun) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/azurestackhci/2023-03-01/updates/predicates.go b/resource-manager/azurestackhci/2023-03-01/updates/predicates.go
index 9916840678c..d64c5b9063f 100644
--- a/resource-manager/azurestackhci/2023-03-01/updates/predicates.go
+++ b/resource-manager/azurestackhci/2023-03-01/updates/predicates.go
@@ -12,19 +12,19 @@ type UpdateOperationPredicate struct {
 
 func (p UpdateOperationPredicate) Matches(input Update) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/azurestackhci/2023-03-01/updatesummaries/predicates.go b/resource-manager/azurestackhci/2023-03-01/updatesummaries/predicates.go
index 0fdf1be7233..ec256ccef50 100644
--- a/resource-manager/azurestackhci/2023-03-01/updatesummaries/predicates.go
+++ b/resource-manager/azurestackhci/2023-03-01/updatesummaries/predicates.go
@@ -12,19 +12,19 @@ type UpdateSummariesOperationPredicate struct {
 
 func (p UpdateSummariesOperationPredicate) Matches(input UpdateSummaries) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/batch/2023-05-01/application/predicates.go b/resource-manager/batch/2023-05-01/application/predicates.go
index 85f552c082d..07f37439788 100644
--- a/resource-manager/batch/2023-05-01/application/predicates.go
+++ b/resource-manager/batch/2023-05-01/application/predicates.go
@@ -12,19 +12,19 @@ type ApplicationOperationPredicate struct {
 
 func (p ApplicationOperationPredicate) Matches(input Application) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/batch/2023-05-01/applicationpackage/predicates.go b/resource-manager/batch/2023-05-01/applicationpackage/predicates.go
index 369dc2dcc8e..8841aed23a6 100644
--- a/resource-manager/batch/2023-05-01/applicationpackage/predicates.go
+++ b/resource-manager/batch/2023-05-01/applicationpackage/predicates.go
@@ -12,19 +12,19 @@ type ApplicationPackageOperationPredicate struct {
 
 func (p ApplicationPackageOperationPredicate) Matches(input ApplicationPackage) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/batch/2023-05-01/batchaccount/predicates.go b/resource-manager/batch/2023-05-01/batchaccount/predicates.go
index 3caafee35bf..30739ec3997 100644
--- a/resource-manager/batch/2023-05-01/batchaccount/predicates.go
+++ b/resource-manager/batch/2023-05-01/batchaccount/predicates.go
@@ -12,19 +12,19 @@ type BatchAccountOperationPredicate struct {
 
 func (p BatchAccountOperationPredicate) Matches(input BatchAccount) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -37,7 +37,7 @@ type OutboundEnvironmentEndpointOperationPredicate struct {
 
 func (p OutboundEnvironmentEndpointOperationPredicate) Matches(input OutboundEnvironmentEndpoint) bool {
 
-	if p.Category != nil && (input.Category == nil && *p.Category != *input.Category) {
+	if p.Category != nil && (input.Category == nil || *p.Category != *input.Category) {
 		return false
 	}
 
diff --git a/resource-manager/batch/2023-05-01/batchmanagements/predicates.go b/resource-manager/batch/2023-05-01/batchmanagements/predicates.go
index 8793473abda..a38aabd4183 100644
--- a/resource-manager/batch/2023-05-01/batchmanagements/predicates.go
+++ b/resource-manager/batch/2023-05-01/batchmanagements/predicates.go
@@ -12,19 +12,19 @@ type DetectorResponseOperationPredicate struct {
 
 func (p DetectorResponseOperationPredicate) Matches(input DetectorResponse) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/batch/2023-05-01/certificate/predicates.go b/resource-manager/batch/2023-05-01/certificate/predicates.go
index 981c6d1c914..e1663bf2b07 100644
--- a/resource-manager/batch/2023-05-01/certificate/predicates.go
+++ b/resource-manager/batch/2023-05-01/certificate/predicates.go
@@ -12,19 +12,19 @@ type CertificateOperationPredicate struct {
 
 func (p CertificateOperationPredicate) Matches(input Certificate) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/batch/2023-05-01/location/predicates.go b/resource-manager/batch/2023-05-01/location/predicates.go
index d9b672c5651..2afe508f931 100644
--- a/resource-manager/batch/2023-05-01/location/predicates.go
+++ b/resource-manager/batch/2023-05-01/location/predicates.go
@@ -10,11 +10,11 @@ type SupportedSkuOperationPredicate struct {
 
 func (p SupportedSkuOperationPredicate) Matches(input SupportedSku) bool {
 
-	if p.FamilyName != nil && (input.FamilyName == nil && *p.FamilyName != *input.FamilyName) {
+	if p.FamilyName != nil && (input.FamilyName == nil || *p.FamilyName != *input.FamilyName) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/batch/2023-05-01/pool/predicates.go b/resource-manager/batch/2023-05-01/pool/predicates.go
index 7c78fdfe219..49ae3e2310d 100644
--- a/resource-manager/batch/2023-05-01/pool/predicates.go
+++ b/resource-manager/batch/2023-05-01/pool/predicates.go
@@ -12,19 +12,19 @@ type PoolOperationPredicate struct {
 
 func (p PoolOperationPredicate) Matches(input Pool) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/batch/2023-05-01/privateendpointconnection/predicates.go b/resource-manager/batch/2023-05-01/privateendpointconnection/predicates.go
index 345077b621a..92647ebc1ea 100644
--- a/resource-manager/batch/2023-05-01/privateendpointconnection/predicates.go
+++ b/resource-manager/batch/2023-05-01/privateendpointconnection/predicates.go
@@ -12,19 +12,19 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/batch/2023-05-01/privatelinkresource/predicates.go b/resource-manager/batch/2023-05-01/privatelinkresource/predicates.go
index 3b238ad8133..d3378fa9cf3 100644
--- a/resource-manager/batch/2023-05-01/privatelinkresource/predicates.go
+++ b/resource-manager/batch/2023-05-01/privatelinkresource/predicates.go
@@ -12,19 +12,19 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/blueprints/2018-11-01-preview/assignment/predicates.go b/resource-manager/blueprints/2018-11-01-preview/assignment/predicates.go
index 2b414e89f40..99630e47896 100644
--- a/resource-manager/blueprints/2018-11-01-preview/assignment/predicates.go
+++ b/resource-manager/blueprints/2018-11-01-preview/assignment/predicates.go
@@ -12,7 +12,7 @@ type AssignmentOperationPredicate struct {
 
 func (p AssignmentOperationPredicate) Matches(input Assignment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p AssignmentOperationPredicate) Matches(input Assignment) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/blueprints/2018-11-01-preview/assignmentoperations/predicates.go b/resource-manager/blueprints/2018-11-01-preview/assignmentoperations/predicates.go
index 59dba3fc9fd..ca48582006e 100644
--- a/resource-manager/blueprints/2018-11-01-preview/assignmentoperations/predicates.go
+++ b/resource-manager/blueprints/2018-11-01-preview/assignmentoperations/predicates.go
@@ -11,15 +11,15 @@ type AssignmentOperationOperationPredicate struct {
 
 func (p AssignmentOperationOperationPredicate) Matches(input AssignmentOperation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/blueprints/2018-11-01-preview/blueprint/predicates.go b/resource-manager/blueprints/2018-11-01-preview/blueprint/predicates.go
index e6ad6a38f55..4fe0ccf1d00 100644
--- a/resource-manager/blueprints/2018-11-01-preview/blueprint/predicates.go
+++ b/resource-manager/blueprints/2018-11-01-preview/blueprint/predicates.go
@@ -11,15 +11,15 @@ type BlueprintOperationPredicate struct {
 
 func (p BlueprintOperationPredicate) Matches(input Blueprint) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/blueprints/2018-11-01-preview/publishedblueprint/predicates.go b/resource-manager/blueprints/2018-11-01-preview/publishedblueprint/predicates.go
index 999d46e4db1..d0bffbc3ded 100644
--- a/resource-manager/blueprints/2018-11-01-preview/publishedblueprint/predicates.go
+++ b/resource-manager/blueprints/2018-11-01-preview/publishedblueprint/predicates.go
@@ -11,15 +11,15 @@ type PublishedBlueprintOperationPredicate struct {
 
 func (p PublishedBlueprintOperationPredicate) Matches(input PublishedBlueprint) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/chaosstudio/2022-07-01-preview/capabilities/predicates.go b/resource-manager/chaosstudio/2022-07-01-preview/capabilities/predicates.go
index ab7df163435..4e83d4f0034 100644
--- a/resource-manager/chaosstudio/2022-07-01-preview/capabilities/predicates.go
+++ b/resource-manager/chaosstudio/2022-07-01-preview/capabilities/predicates.go
@@ -11,15 +11,15 @@ type CapabilityOperationPredicate struct {
 
 func (p CapabilityOperationPredicate) Matches(input Capability) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/chaosstudio/2022-07-01-preview/capabilitytypes/predicates.go b/resource-manager/chaosstudio/2022-07-01-preview/capabilitytypes/predicates.go
index 555b747ada8..39d040ae4dc 100644
--- a/resource-manager/chaosstudio/2022-07-01-preview/capabilitytypes/predicates.go
+++ b/resource-manager/chaosstudio/2022-07-01-preview/capabilitytypes/predicates.go
@@ -12,19 +12,19 @@ type CapabilityTypeOperationPredicate struct {
 
 func (p CapabilityTypeOperationPredicate) Matches(input CapabilityType) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/chaosstudio/2022-07-01-preview/experiments/predicates.go b/resource-manager/chaosstudio/2022-07-01-preview/experiments/predicates.go
index f2890ce58bd..c986cc9cb77 100644
--- a/resource-manager/chaosstudio/2022-07-01-preview/experiments/predicates.go
+++ b/resource-manager/chaosstudio/2022-07-01-preview/experiments/predicates.go
@@ -12,7 +12,7 @@ type ExperimentOperationPredicate struct {
 
 func (p ExperimentOperationPredicate) Matches(input Experiment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ExperimentOperationPredicate) Matches(input Experiment) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -39,15 +39,15 @@ type ExperimentExecutionDetailsOperationPredicate struct {
 
 func (p ExperimentExecutionDetailsOperationPredicate) Matches(input ExperimentExecutionDetails) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -62,15 +62,15 @@ type ExperimentStatusOperationPredicate struct {
 
 func (p ExperimentStatusOperationPredicate) Matches(input ExperimentStatus) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/chaosstudio/2022-07-01-preview/targets/predicates.go b/resource-manager/chaosstudio/2022-07-01-preview/targets/predicates.go
index c99b2dd1054..d3325e9406e 100644
--- a/resource-manager/chaosstudio/2022-07-01-preview/targets/predicates.go
+++ b/resource-manager/chaosstudio/2022-07-01-preview/targets/predicates.go
@@ -13,15 +13,15 @@ type TargetOperationPredicate struct {
 
 func (p TargetOperationPredicate) Matches(input Target) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
@@ -29,7 +29,7 @@ func (p TargetOperationPredicate) Matches(input Target) bool {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/chaosstudio/2022-07-01-preview/targettypes/predicates.go b/resource-manager/chaosstudio/2022-07-01-preview/targettypes/predicates.go
index e3a2689bcae..2e7238df56b 100644
--- a/resource-manager/chaosstudio/2022-07-01-preview/targettypes/predicates.go
+++ b/resource-manager/chaosstudio/2022-07-01-preview/targettypes/predicates.go
@@ -12,19 +12,19 @@ type TargetTypeOperationPredicate struct {
 
 func (p TargetTypeOperationPredicate) Matches(input TargetType) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/cognitive/2023-05-01/cognitiveservicesaccounts/predicates.go b/resource-manager/cognitive/2023-05-01/cognitiveservicesaccounts/predicates.go
index 35ed56f4844..2bb35fbc86c 100644
--- a/resource-manager/cognitive/2023-05-01/cognitiveservicesaccounts/predicates.go
+++ b/resource-manager/cognitive/2023-05-01/cognitiveservicesaccounts/predicates.go
@@ -14,27 +14,27 @@ type AccountOperationPredicate struct {
 
 func (p AccountOperationPredicate) Matches(input Account) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -52,27 +52,27 @@ type AccountModelOperationPredicate struct {
 
 func (p AccountModelOperationPredicate) Matches(input AccountModel) bool {
 
-	if p.Format != nil && (input.Format == nil && *p.Format != *input.Format) {
+	if p.Format != nil && (input.Format == nil || *p.Format != *input.Format) {
 		return false
 	}
 
-	if p.IsDefaultVersion != nil && (input.IsDefaultVersion == nil && *p.IsDefaultVersion != *input.IsDefaultVersion) {
+	if p.IsDefaultVersion != nil && (input.IsDefaultVersion == nil || *p.IsDefaultVersion != *input.IsDefaultVersion) {
 		return false
 	}
 
-	if p.MaxCapacity != nil && (input.MaxCapacity == nil && *p.MaxCapacity != *input.MaxCapacity) {
+	if p.MaxCapacity != nil && (input.MaxCapacity == nil || *p.MaxCapacity != *input.MaxCapacity) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Source != nil && (input.Source == nil && *p.Source != *input.Source) {
+	if p.Source != nil && (input.Source == nil || *p.Source != *input.Source) {
 		return false
 	}
 
-	if p.Version != nil && (input.Version == nil && *p.Version != *input.Version) {
+	if p.Version != nil && (input.Version == nil || *p.Version != *input.Version) {
 		return false
 	}
 
@@ -88,19 +88,19 @@ type ResourceSkuOperationPredicate struct {
 
 func (p ResourceSkuOperationPredicate) Matches(input ResourceSku) bool {
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
-	if p.Tier != nil && (input.Tier == nil && *p.Tier != *input.Tier) {
+	if p.Tier != nil && (input.Tier == nil || *p.Tier != *input.Tier) {
 		return false
 	}
 
diff --git a/resource-manager/cognitive/2023-05-01/cognitiveservicescommitmentplans/predicates.go b/resource-manager/cognitive/2023-05-01/cognitiveservicescommitmentplans/predicates.go
index a9d590e6a3b..2a6f11835e4 100644
--- a/resource-manager/cognitive/2023-05-01/cognitiveservicescommitmentplans/predicates.go
+++ b/resource-manager/cognitive/2023-05-01/cognitiveservicescommitmentplans/predicates.go
@@ -14,27 +14,27 @@ type CommitmentPlanOperationPredicate struct {
 
 func (p CommitmentPlanOperationPredicate) Matches(input CommitmentPlan) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/cognitive/2023-05-01/commitmentplans/predicates.go b/resource-manager/cognitive/2023-05-01/commitmentplans/predicates.go
index c94b55617ff..26c60f96ce0 100644
--- a/resource-manager/cognitive/2023-05-01/commitmentplans/predicates.go
+++ b/resource-manager/cognitive/2023-05-01/commitmentplans/predicates.go
@@ -14,27 +14,27 @@ type CommitmentPlanOperationPredicate struct {
 
 func (p CommitmentPlanOperationPredicate) Matches(input CommitmentPlan) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -50,19 +50,19 @@ type CommitmentPlanAccountAssociationOperationPredicate struct {
 
 func (p CommitmentPlanAccountAssociationOperationPredicate) Matches(input CommitmentPlanAccountAssociation) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/cognitive/2023-05-01/commitmenttiers/predicates.go b/resource-manager/cognitive/2023-05-01/commitmenttiers/predicates.go
index ac44c7626b5..54244bba0d1 100644
--- a/resource-manager/cognitive/2023-05-01/commitmenttiers/predicates.go
+++ b/resource-manager/cognitive/2023-05-01/commitmenttiers/predicates.go
@@ -13,23 +13,23 @@ type CommitmentTierOperationPredicate struct {
 
 func (p CommitmentTierOperationPredicate) Matches(input CommitmentTier) bool {
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.MaxCount != nil && (input.MaxCount == nil && *p.MaxCount != *input.MaxCount) {
+	if p.MaxCount != nil && (input.MaxCount == nil || *p.MaxCount != *input.MaxCount) {
 		return false
 	}
 
-	if p.PlanType != nil && (input.PlanType == nil && *p.PlanType != *input.PlanType) {
+	if p.PlanType != nil && (input.PlanType == nil || *p.PlanType != *input.PlanType) {
 		return false
 	}
 
-	if p.SkuName != nil && (input.SkuName == nil && *p.SkuName != *input.SkuName) {
+	if p.SkuName != nil && (input.SkuName == nil || *p.SkuName != *input.SkuName) {
 		return false
 	}
 
-	if p.Tier != nil && (input.Tier == nil && *p.Tier != *input.Tier) {
+	if p.Tier != nil && (input.Tier == nil || *p.Tier != *input.Tier) {
 		return false
 	}
 
diff --git a/resource-manager/cognitive/2023-05-01/deployments/predicates.go b/resource-manager/cognitive/2023-05-01/deployments/predicates.go
index d75f7c44e34..6d9ad35e72e 100644
--- a/resource-manager/cognitive/2023-05-01/deployments/predicates.go
+++ b/resource-manager/cognitive/2023-05-01/deployments/predicates.go
@@ -12,19 +12,19 @@ type DeploymentOperationPredicate struct {
 
 func (p DeploymentOperationPredicate) Matches(input Deployment) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/cognitive/2023-05-01/models/predicates.go b/resource-manager/cognitive/2023-05-01/models/predicates.go
index 24522fddf82..f557c1de06c 100644
--- a/resource-manager/cognitive/2023-05-01/models/predicates.go
+++ b/resource-manager/cognitive/2023-05-01/models/predicates.go
@@ -10,11 +10,11 @@ type ModelOperationPredicate struct {
 
 func (p ModelOperationPredicate) Matches(input Model) bool {
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.SkuName != nil && (input.SkuName == nil && *p.SkuName != *input.SkuName) {
+	if p.SkuName != nil && (input.SkuName == nil || *p.SkuName != *input.SkuName) {
 		return false
 	}
 
diff --git a/resource-manager/cognitive/2023-05-01/skus/predicates.go b/resource-manager/cognitive/2023-05-01/skus/predicates.go
index 22b1dd50902..a77c2f3056a 100644
--- a/resource-manager/cognitive/2023-05-01/skus/predicates.go
+++ b/resource-manager/cognitive/2023-05-01/skus/predicates.go
@@ -12,19 +12,19 @@ type ResourceSkuOperationPredicate struct {
 
 func (p ResourceSkuOperationPredicate) Matches(input ResourceSku) bool {
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
-	if p.Tier != nil && (input.Tier == nil && *p.Tier != *input.Tier) {
+	if p.Tier != nil && (input.Tier == nil || *p.Tier != *input.Tier) {
 		return false
 	}
 
diff --git a/resource-manager/cognitive/2023-05-01/usages/predicates.go b/resource-manager/cognitive/2023-05-01/usages/predicates.go
index 40757506a41..7cbeca39890 100644
--- a/resource-manager/cognitive/2023-05-01/usages/predicates.go
+++ b/resource-manager/cognitive/2023-05-01/usages/predicates.go
@@ -12,19 +12,19 @@ type UsageOperationPredicate struct {
 
 func (p UsageOperationPredicate) Matches(input Usage) bool {
 
-	if p.CurrentValue != nil && (input.CurrentValue == nil && *p.CurrentValue != *input.CurrentValue) {
+	if p.CurrentValue != nil && (input.CurrentValue == nil || *p.CurrentValue != *input.CurrentValue) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
-	if p.NextResetTime != nil && (input.NextResetTime == nil && *p.NextResetTime != *input.NextResetTime) {
+	if p.NextResetTime != nil && (input.NextResetTime == nil || *p.NextResetTime != *input.NextResetTime) {
 		return false
 	}
 
-	if p.QuotaPeriod != nil && (input.QuotaPeriod == nil && *p.QuotaPeriod != *input.QuotaPeriod) {
+	if p.QuotaPeriod != nil && (input.QuotaPeriod == nil || *p.QuotaPeriod != *input.QuotaPeriod) {
 		return false
 	}
 
diff --git a/resource-manager/communication/2023-03-31/communicationservices/predicates.go b/resource-manager/communication/2023-03-31/communicationservices/predicates.go
index bdc51311842..bd33d08ea44 100644
--- a/resource-manager/communication/2023-03-31/communicationservices/predicates.go
+++ b/resource-manager/communication/2023-03-31/communicationservices/predicates.go
@@ -12,7 +12,7 @@ type CommunicationServiceResourceOperationPredicate struct {
 
 func (p CommunicationServiceResourceOperationPredicate) Matches(input CommunicationServiceResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p CommunicationServiceResourceOperationPredicate) Matches(input Communicat
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/communication/2023-03-31/domains/predicates.go b/resource-manager/communication/2023-03-31/domains/predicates.go
index 6728c5aaed9..4ce2a03ba6e 100644
--- a/resource-manager/communication/2023-03-31/domains/predicates.go
+++ b/resource-manager/communication/2023-03-31/domains/predicates.go
@@ -12,7 +12,7 @@ type DomainResourceOperationPredicate struct {
 
 func (p DomainResourceOperationPredicate) Matches(input DomainResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p DomainResourceOperationPredicate) Matches(input DomainResource) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/communication/2023-03-31/emailservices/predicates.go b/resource-manager/communication/2023-03-31/emailservices/predicates.go
index 0f365984dda..bdcdeb160e7 100644
--- a/resource-manager/communication/2023-03-31/emailservices/predicates.go
+++ b/resource-manager/communication/2023-03-31/emailservices/predicates.go
@@ -12,7 +12,7 @@ type EmailServiceResourceOperationPredicate struct {
 
 func (p EmailServiceResourceOperationPredicate) Matches(input EmailServiceResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p EmailServiceResourceOperationPredicate) Matches(input EmailServiceResour
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/communication/2023-03-31/senderusernames/predicates.go b/resource-manager/communication/2023-03-31/senderusernames/predicates.go
index 47ea5ca5c9b..d25323f83a5 100644
--- a/resource-manager/communication/2023-03-31/senderusernames/predicates.go
+++ b/resource-manager/communication/2023-03-31/senderusernames/predicates.go
@@ -11,15 +11,15 @@ type SenderUsernameResourceOperationPredicate struct {
 
 func (p SenderUsernameResourceOperationPredicate) Matches(input SenderUsernameResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/availabilitysets/predicates.go b/resource-manager/compute/2021-07-01/availabilitysets/predicates.go
index 5dded1e08de..29fe762df0a 100644
--- a/resource-manager/compute/2021-07-01/availabilitysets/predicates.go
+++ b/resource-manager/compute/2021-07-01/availabilitysets/predicates.go
@@ -14,27 +14,27 @@ type ResourceSkuOperationPredicate struct {
 
 func (p ResourceSkuOperationPredicate) Matches(input ResourceSku) bool {
 
-	if p.Family != nil && (input.Family == nil && *p.Family != *input.Family) {
+	if p.Family != nil && (input.Family == nil || *p.Family != *input.Family) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
-	if p.Size != nil && (input.Size == nil && *p.Size != *input.Size) {
+	if p.Size != nil && (input.Size == nil || *p.Size != *input.Size) {
 		return false
 	}
 
-	if p.Tier != nil && (input.Tier == nil && *p.Tier != *input.Tier) {
+	if p.Tier != nil && (input.Tier == nil || *p.Tier != *input.Tier) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/capacityreservation/predicates.go b/resource-manager/compute/2021-07-01/capacityreservation/predicates.go
index ec98941d7ba..b8a1f7fb332 100644
--- a/resource-manager/compute/2021-07-01/capacityreservation/predicates.go
+++ b/resource-manager/compute/2021-07-01/capacityreservation/predicates.go
@@ -12,7 +12,7 @@ type CapacityReservationOperationPredicate struct {
 
 func (p CapacityReservationOperationPredicate) Matches(input CapacityReservation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p CapacityReservationOperationPredicate) Matches(input CapacityReservation
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/capacityreservationgroups/predicates.go b/resource-manager/compute/2021-07-01/capacityreservationgroups/predicates.go
index 6e394496b4b..d33edd6ae80 100644
--- a/resource-manager/compute/2021-07-01/capacityreservationgroups/predicates.go
+++ b/resource-manager/compute/2021-07-01/capacityreservationgroups/predicates.go
@@ -12,7 +12,7 @@ type CapacityReservationGroupOperationPredicate struct {
 
 func (p CapacityReservationGroupOperationPredicate) Matches(input CapacityReservationGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p CapacityReservationGroupOperationPredicate) Matches(input CapacityReserv
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/dedicatedhost/predicates.go b/resource-manager/compute/2021-07-01/dedicatedhost/predicates.go
index 477a8351ed5..f3fee1b89c7 100644
--- a/resource-manager/compute/2021-07-01/dedicatedhost/predicates.go
+++ b/resource-manager/compute/2021-07-01/dedicatedhost/predicates.go
@@ -12,7 +12,7 @@ type DedicatedHostOperationPredicate struct {
 
 func (p DedicatedHostOperationPredicate) Matches(input DedicatedHost) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p DedicatedHostOperationPredicate) Matches(input DedicatedHost) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/dedicatedhostgroups/predicates.go b/resource-manager/compute/2021-07-01/dedicatedhostgroups/predicates.go
index 4e1f9627d8d..de1da527708 100644
--- a/resource-manager/compute/2021-07-01/dedicatedhostgroups/predicates.go
+++ b/resource-manager/compute/2021-07-01/dedicatedhostgroups/predicates.go
@@ -12,7 +12,7 @@ type DedicatedHostGroupOperationPredicate struct {
 
 func (p DedicatedHostGroupOperationPredicate) Matches(input DedicatedHostGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p DedicatedHostGroupOperationPredicate) Matches(input DedicatedHostGroup)
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/galleries/predicates.go b/resource-manager/compute/2021-07-01/galleries/predicates.go
index 44607183b62..1d7b96c6b98 100644
--- a/resource-manager/compute/2021-07-01/galleries/predicates.go
+++ b/resource-manager/compute/2021-07-01/galleries/predicates.go
@@ -12,7 +12,7 @@ type GalleryOperationPredicate struct {
 
 func (p GalleryOperationPredicate) Matches(input Gallery) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p GalleryOperationPredicate) Matches(input Gallery) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/galleryapplications/predicates.go b/resource-manager/compute/2021-07-01/galleryapplications/predicates.go
index 9931a9255b6..fd795c85404 100644
--- a/resource-manager/compute/2021-07-01/galleryapplications/predicates.go
+++ b/resource-manager/compute/2021-07-01/galleryapplications/predicates.go
@@ -12,7 +12,7 @@ type GalleryApplicationOperationPredicate struct {
 
 func (p GalleryApplicationOperationPredicate) Matches(input GalleryApplication) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p GalleryApplicationOperationPredicate) Matches(input GalleryApplication)
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/galleryapplicationversions/predicates.go b/resource-manager/compute/2021-07-01/galleryapplicationversions/predicates.go
index 112939f59bc..430035d15e0 100644
--- a/resource-manager/compute/2021-07-01/galleryapplicationversions/predicates.go
+++ b/resource-manager/compute/2021-07-01/galleryapplicationversions/predicates.go
@@ -12,7 +12,7 @@ type GalleryApplicationVersionOperationPredicate struct {
 
 func (p GalleryApplicationVersionOperationPredicate) Matches(input GalleryApplicationVersion) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p GalleryApplicationVersionOperationPredicate) Matches(input GalleryApplic
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/galleryimages/predicates.go b/resource-manager/compute/2021-07-01/galleryimages/predicates.go
index 4711146859b..90c6e156593 100644
--- a/resource-manager/compute/2021-07-01/galleryimages/predicates.go
+++ b/resource-manager/compute/2021-07-01/galleryimages/predicates.go
@@ -12,7 +12,7 @@ type GalleryImageOperationPredicate struct {
 
 func (p GalleryImageOperationPredicate) Matches(input GalleryImage) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p GalleryImageOperationPredicate) Matches(input GalleryImage) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/galleryimageversions/predicates.go b/resource-manager/compute/2021-07-01/galleryimageversions/predicates.go
index 79778851879..bd9aebcaedf 100644
--- a/resource-manager/compute/2021-07-01/galleryimageversions/predicates.go
+++ b/resource-manager/compute/2021-07-01/galleryimageversions/predicates.go
@@ -12,7 +12,7 @@ type GalleryImageVersionOperationPredicate struct {
 
 func (p GalleryImageVersionOperationPredicate) Matches(input GalleryImageVersion) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p GalleryImageVersionOperationPredicate) Matches(input GalleryImageVersion
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/images/predicates.go b/resource-manager/compute/2021-07-01/images/predicates.go
index d77da3842cc..7d036d2c839 100644
--- a/resource-manager/compute/2021-07-01/images/predicates.go
+++ b/resource-manager/compute/2021-07-01/images/predicates.go
@@ -12,7 +12,7 @@ type ImageOperationPredicate struct {
 
 func (p ImageOperationPredicate) Matches(input Image) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ImageOperationPredicate) Matches(input Image) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/proximityplacementgroups/predicates.go b/resource-manager/compute/2021-07-01/proximityplacementgroups/predicates.go
index 0144daa9e99..3e0bc38e4a2 100644
--- a/resource-manager/compute/2021-07-01/proximityplacementgroups/predicates.go
+++ b/resource-manager/compute/2021-07-01/proximityplacementgroups/predicates.go
@@ -12,7 +12,7 @@ type ProximityPlacementGroupOperationPredicate struct {
 
 func (p ProximityPlacementGroupOperationPredicate) Matches(input ProximityPlacementGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ProximityPlacementGroupOperationPredicate) Matches(input ProximityPlacem
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/restorepointcollections/predicates.go b/resource-manager/compute/2021-07-01/restorepointcollections/predicates.go
index 57a6cda48ad..6f4eb007a65 100644
--- a/resource-manager/compute/2021-07-01/restorepointcollections/predicates.go
+++ b/resource-manager/compute/2021-07-01/restorepointcollections/predicates.go
@@ -12,7 +12,7 @@ type RestorePointCollectionOperationPredicate struct {
 
 func (p RestorePointCollectionOperationPredicate) Matches(input RestorePointCollection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p RestorePointCollectionOperationPredicate) Matches(input RestorePointColl
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/sharedgalleries/predicates.go b/resource-manager/compute/2021-07-01/sharedgalleries/predicates.go
index ecb3f898b03..0fd26798289 100644
--- a/resource-manager/compute/2021-07-01/sharedgalleries/predicates.go
+++ b/resource-manager/compute/2021-07-01/sharedgalleries/predicates.go
@@ -10,11 +10,11 @@ type PirSharedGalleryResourceOperationPredicate struct {
 
 func (p PirSharedGalleryResourceOperationPredicate) Matches(input PirSharedGalleryResource) bool {
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/sharedgalleryimages/predicates.go b/resource-manager/compute/2021-07-01/sharedgalleryimages/predicates.go
index 260dd352aff..8f40d3da095 100644
--- a/resource-manager/compute/2021-07-01/sharedgalleryimages/predicates.go
+++ b/resource-manager/compute/2021-07-01/sharedgalleryimages/predicates.go
@@ -10,11 +10,11 @@ type SharedGalleryImageOperationPredicate struct {
 
 func (p SharedGalleryImageOperationPredicate) Matches(input SharedGalleryImage) bool {
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/sharedgalleryimageversions/predicates.go b/resource-manager/compute/2021-07-01/sharedgalleryimageversions/predicates.go
index 3424313f495..9a9a98e50b0 100644
--- a/resource-manager/compute/2021-07-01/sharedgalleryimageversions/predicates.go
+++ b/resource-manager/compute/2021-07-01/sharedgalleryimageversions/predicates.go
@@ -10,11 +10,11 @@ type SharedGalleryImageVersionOperationPredicate struct {
 
 func (p SharedGalleryImageVersionOperationPredicate) Matches(input SharedGalleryImageVersion) bool {
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/skus/predicates.go b/resource-manager/compute/2021-07-01/skus/predicates.go
index 7aa7a858cd0..35bfc7140d7 100644
--- a/resource-manager/compute/2021-07-01/skus/predicates.go
+++ b/resource-manager/compute/2021-07-01/skus/predicates.go
@@ -14,27 +14,27 @@ type ResourceSkuOperationPredicate struct {
 
 func (p ResourceSkuOperationPredicate) Matches(input ResourceSku) bool {
 
-	if p.Family != nil && (input.Family == nil && *p.Family != *input.Family) {
+	if p.Family != nil && (input.Family == nil || *p.Family != *input.Family) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
-	if p.Size != nil && (input.Size == nil && *p.Size != *input.Size) {
+	if p.Size != nil && (input.Size == nil || *p.Size != *input.Size) {
 		return false
 	}
 
-	if p.Tier != nil && (input.Tier == nil && *p.Tier != *input.Tier) {
+	if p.Tier != nil && (input.Tier == nil || *p.Tier != *input.Tier) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/sshpublickeys/predicates.go b/resource-manager/compute/2021-07-01/sshpublickeys/predicates.go
index 41d8c1ef7fe..eafbb4400ce 100644
--- a/resource-manager/compute/2021-07-01/sshpublickeys/predicates.go
+++ b/resource-manager/compute/2021-07-01/sshpublickeys/predicates.go
@@ -12,7 +12,7 @@ type SshPublicKeyResourceOperationPredicate struct {
 
 func (p SshPublicKeyResourceOperationPredicate) Matches(input SshPublicKeyResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SshPublicKeyResourceOperationPredicate) Matches(input SshPublicKeyResour
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/virtualmachineruncommands/predicates.go b/resource-manager/compute/2021-07-01/virtualmachineruncommands/predicates.go
index b9cbb574d56..80b5a5e96e9 100644
--- a/resource-manager/compute/2021-07-01/virtualmachineruncommands/predicates.go
+++ b/resource-manager/compute/2021-07-01/virtualmachineruncommands/predicates.go
@@ -40,7 +40,7 @@ type VirtualMachineRunCommandOperationPredicate struct {
 
 func (p VirtualMachineRunCommandOperationPredicate) Matches(input VirtualMachineRunCommand) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -48,11 +48,11 @@ func (p VirtualMachineRunCommandOperationPredicate) Matches(input VirtualMachine
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/virtualmachines/predicates.go b/resource-manager/compute/2021-07-01/virtualmachines/predicates.go
index 87d934957d9..b6284a17521 100644
--- a/resource-manager/compute/2021-07-01/virtualmachines/predicates.go
+++ b/resource-manager/compute/2021-07-01/virtualmachines/predicates.go
@@ -12,7 +12,7 @@ type VirtualMachineOperationPredicate struct {
 
 func (p VirtualMachineOperationPredicate) Matches(input VirtualMachine) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p VirtualMachineOperationPredicate) Matches(input VirtualMachine) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/virtualmachinescalesetextensions/predicates.go b/resource-manager/compute/2021-07-01/virtualmachinescalesetextensions/predicates.go
index 6a10ea7965d..a03d9f7aa2b 100644
--- a/resource-manager/compute/2021-07-01/virtualmachinescalesetextensions/predicates.go
+++ b/resource-manager/compute/2021-07-01/virtualmachinescalesetextensions/predicates.go
@@ -11,15 +11,15 @@ type VirtualMachineScaleSetExtensionOperationPredicate struct {
 
 func (p VirtualMachineScaleSetExtensionOperationPredicate) Matches(input VirtualMachineScaleSetExtension) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/virtualmachinescalesets/predicates.go b/resource-manager/compute/2021-07-01/virtualmachinescalesets/predicates.go
index 755a7ee6173..d0f5a0f71b9 100644
--- a/resource-manager/compute/2021-07-01/virtualmachinescalesets/predicates.go
+++ b/resource-manager/compute/2021-07-01/virtualmachinescalesets/predicates.go
@@ -10,11 +10,11 @@ type UpgradeOperationHistoricalStatusInfoOperationPredicate struct {
 
 func (p UpgradeOperationHistoricalStatusInfoOperationPredicate) Matches(input UpgradeOperationHistoricalStatusInfo) bool {
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -30,7 +30,7 @@ type VirtualMachineScaleSetOperationPredicate struct {
 
 func (p VirtualMachineScaleSetOperationPredicate) Matches(input VirtualMachineScaleSet) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -38,11 +38,11 @@ func (p VirtualMachineScaleSetOperationPredicate) Matches(input VirtualMachineSc
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -55,7 +55,7 @@ type VirtualMachineScaleSetSkuOperationPredicate struct {
 
 func (p VirtualMachineScaleSetSkuOperationPredicate) Matches(input VirtualMachineScaleSetSku) bool {
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/virtualmachinescalesetvmruncommands/predicates.go b/resource-manager/compute/2021-07-01/virtualmachinescalesetvmruncommands/predicates.go
index d05e46253d3..3858937cfb3 100644
--- a/resource-manager/compute/2021-07-01/virtualmachinescalesetvmruncommands/predicates.go
+++ b/resource-manager/compute/2021-07-01/virtualmachinescalesetvmruncommands/predicates.go
@@ -12,7 +12,7 @@ type VirtualMachineRunCommandOperationPredicate struct {
 
 func (p VirtualMachineRunCommandOperationPredicate) Matches(input VirtualMachineRunCommand) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p VirtualMachineRunCommandOperationPredicate) Matches(input VirtualMachine
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-07-01/virtualmachinescalesetvms/predicates.go b/resource-manager/compute/2021-07-01/virtualmachinescalesetvms/predicates.go
index 23dd767b46e..6aaef8b22e0 100644
--- a/resource-manager/compute/2021-07-01/virtualmachinescalesetvms/predicates.go
+++ b/resource-manager/compute/2021-07-01/virtualmachinescalesetvms/predicates.go
@@ -13,11 +13,11 @@ type VirtualMachineScaleSetVMOperationPredicate struct {
 
 func (p VirtualMachineScaleSetVMOperationPredicate) Matches(input VirtualMachineScaleSetVM) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.InstanceId != nil && (input.InstanceId == nil && *p.InstanceId != *input.InstanceId) {
+	if p.InstanceId != nil && (input.InstanceId == nil || *p.InstanceId != *input.InstanceId) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p VirtualMachineScaleSetVMOperationPredicate) Matches(input VirtualMachine
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-11-01/availabilitysets/predicates.go b/resource-manager/compute/2021-11-01/availabilitysets/predicates.go
index 721d485954d..bb3e2b2b319 100644
--- a/resource-manager/compute/2021-11-01/availabilitysets/predicates.go
+++ b/resource-manager/compute/2021-11-01/availabilitysets/predicates.go
@@ -12,7 +12,7 @@ type AvailabilitySetOperationPredicate struct {
 
 func (p AvailabilitySetOperationPredicate) Matches(input AvailabilitySet) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p AvailabilitySetOperationPredicate) Matches(input AvailabilitySet) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-11-01/capacityreservation/predicates.go b/resource-manager/compute/2021-11-01/capacityreservation/predicates.go
index ec98941d7ba..b8a1f7fb332 100644
--- a/resource-manager/compute/2021-11-01/capacityreservation/predicates.go
+++ b/resource-manager/compute/2021-11-01/capacityreservation/predicates.go
@@ -12,7 +12,7 @@ type CapacityReservationOperationPredicate struct {
 
 func (p CapacityReservationOperationPredicate) Matches(input CapacityReservation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p CapacityReservationOperationPredicate) Matches(input CapacityReservation
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-11-01/capacityreservationgroups/predicates.go b/resource-manager/compute/2021-11-01/capacityreservationgroups/predicates.go
index 6e394496b4b..d33edd6ae80 100644
--- a/resource-manager/compute/2021-11-01/capacityreservationgroups/predicates.go
+++ b/resource-manager/compute/2021-11-01/capacityreservationgroups/predicates.go
@@ -12,7 +12,7 @@ type CapacityReservationGroupOperationPredicate struct {
 
 func (p CapacityReservationGroupOperationPredicate) Matches(input CapacityReservationGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p CapacityReservationGroupOperationPredicate) Matches(input CapacityReserv
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-11-01/dedicatedhost/predicates.go b/resource-manager/compute/2021-11-01/dedicatedhost/predicates.go
index 477a8351ed5..f3fee1b89c7 100644
--- a/resource-manager/compute/2021-11-01/dedicatedhost/predicates.go
+++ b/resource-manager/compute/2021-11-01/dedicatedhost/predicates.go
@@ -12,7 +12,7 @@ type DedicatedHostOperationPredicate struct {
 
 func (p DedicatedHostOperationPredicate) Matches(input DedicatedHost) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p DedicatedHostOperationPredicate) Matches(input DedicatedHost) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-11-01/dedicatedhostgroups/predicates.go b/resource-manager/compute/2021-11-01/dedicatedhostgroups/predicates.go
index 4e1f9627d8d..de1da527708 100644
--- a/resource-manager/compute/2021-11-01/dedicatedhostgroups/predicates.go
+++ b/resource-manager/compute/2021-11-01/dedicatedhostgroups/predicates.go
@@ -12,7 +12,7 @@ type DedicatedHostGroupOperationPredicate struct {
 
 func (p DedicatedHostGroupOperationPredicate) Matches(input DedicatedHostGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p DedicatedHostGroupOperationPredicate) Matches(input DedicatedHostGroup)
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-11-01/images/predicates.go b/resource-manager/compute/2021-11-01/images/predicates.go
index d77da3842cc..7d036d2c839 100644
--- a/resource-manager/compute/2021-11-01/images/predicates.go
+++ b/resource-manager/compute/2021-11-01/images/predicates.go
@@ -12,7 +12,7 @@ type ImageOperationPredicate struct {
 
 func (p ImageOperationPredicate) Matches(input Image) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ImageOperationPredicate) Matches(input Image) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-11-01/proximityplacementgroups/predicates.go b/resource-manager/compute/2021-11-01/proximityplacementgroups/predicates.go
index 0144daa9e99..3e0bc38e4a2 100644
--- a/resource-manager/compute/2021-11-01/proximityplacementgroups/predicates.go
+++ b/resource-manager/compute/2021-11-01/proximityplacementgroups/predicates.go
@@ -12,7 +12,7 @@ type ProximityPlacementGroupOperationPredicate struct {
 
 func (p ProximityPlacementGroupOperationPredicate) Matches(input ProximityPlacementGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ProximityPlacementGroupOperationPredicate) Matches(input ProximityPlacem
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-11-01/restorepointcollections/predicates.go b/resource-manager/compute/2021-11-01/restorepointcollections/predicates.go
index 57a6cda48ad..6f4eb007a65 100644
--- a/resource-manager/compute/2021-11-01/restorepointcollections/predicates.go
+++ b/resource-manager/compute/2021-11-01/restorepointcollections/predicates.go
@@ -12,7 +12,7 @@ type RestorePointCollectionOperationPredicate struct {
 
 func (p RestorePointCollectionOperationPredicate) Matches(input RestorePointCollection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p RestorePointCollectionOperationPredicate) Matches(input RestorePointColl
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-11-01/sshpublickeys/predicates.go b/resource-manager/compute/2021-11-01/sshpublickeys/predicates.go
index 41d8c1ef7fe..eafbb4400ce 100644
--- a/resource-manager/compute/2021-11-01/sshpublickeys/predicates.go
+++ b/resource-manager/compute/2021-11-01/sshpublickeys/predicates.go
@@ -12,7 +12,7 @@ type SshPublicKeyResourceOperationPredicate struct {
 
 func (p SshPublicKeyResourceOperationPredicate) Matches(input SshPublicKeyResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SshPublicKeyResourceOperationPredicate) Matches(input SshPublicKeyResour
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-11-01/virtualmachineruncommands/predicates.go b/resource-manager/compute/2021-11-01/virtualmachineruncommands/predicates.go
index b9cbb574d56..80b5a5e96e9 100644
--- a/resource-manager/compute/2021-11-01/virtualmachineruncommands/predicates.go
+++ b/resource-manager/compute/2021-11-01/virtualmachineruncommands/predicates.go
@@ -40,7 +40,7 @@ type VirtualMachineRunCommandOperationPredicate struct {
 
 func (p VirtualMachineRunCommandOperationPredicate) Matches(input VirtualMachineRunCommand) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -48,11 +48,11 @@ func (p VirtualMachineRunCommandOperationPredicate) Matches(input VirtualMachine
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-11-01/virtualmachines/predicates.go b/resource-manager/compute/2021-11-01/virtualmachines/predicates.go
index 87d934957d9..b6284a17521 100644
--- a/resource-manager/compute/2021-11-01/virtualmachines/predicates.go
+++ b/resource-manager/compute/2021-11-01/virtualmachines/predicates.go
@@ -12,7 +12,7 @@ type VirtualMachineOperationPredicate struct {
 
 func (p VirtualMachineOperationPredicate) Matches(input VirtualMachine) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p VirtualMachineOperationPredicate) Matches(input VirtualMachine) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-11-01/virtualmachinescalesetextensions/predicates.go b/resource-manager/compute/2021-11-01/virtualmachinescalesetextensions/predicates.go
index 6a10ea7965d..a03d9f7aa2b 100644
--- a/resource-manager/compute/2021-11-01/virtualmachinescalesetextensions/predicates.go
+++ b/resource-manager/compute/2021-11-01/virtualmachinescalesetextensions/predicates.go
@@ -11,15 +11,15 @@ type VirtualMachineScaleSetExtensionOperationPredicate struct {
 
 func (p VirtualMachineScaleSetExtensionOperationPredicate) Matches(input VirtualMachineScaleSetExtension) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-11-01/virtualmachinescalesets/predicates.go b/resource-manager/compute/2021-11-01/virtualmachinescalesets/predicates.go
index 755a7ee6173..d0f5a0f71b9 100644
--- a/resource-manager/compute/2021-11-01/virtualmachinescalesets/predicates.go
+++ b/resource-manager/compute/2021-11-01/virtualmachinescalesets/predicates.go
@@ -10,11 +10,11 @@ type UpgradeOperationHistoricalStatusInfoOperationPredicate struct {
 
 func (p UpgradeOperationHistoricalStatusInfoOperationPredicate) Matches(input UpgradeOperationHistoricalStatusInfo) bool {
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -30,7 +30,7 @@ type VirtualMachineScaleSetOperationPredicate struct {
 
 func (p VirtualMachineScaleSetOperationPredicate) Matches(input VirtualMachineScaleSet) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -38,11 +38,11 @@ func (p VirtualMachineScaleSetOperationPredicate) Matches(input VirtualMachineSc
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -55,7 +55,7 @@ type VirtualMachineScaleSetSkuOperationPredicate struct {
 
 func (p VirtualMachineScaleSetSkuOperationPredicate) Matches(input VirtualMachineScaleSetSku) bool {
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-11-01/virtualmachinescalesetvmruncommands/predicates.go b/resource-manager/compute/2021-11-01/virtualmachinescalesetvmruncommands/predicates.go
index d05e46253d3..3858937cfb3 100644
--- a/resource-manager/compute/2021-11-01/virtualmachinescalesetvmruncommands/predicates.go
+++ b/resource-manager/compute/2021-11-01/virtualmachinescalesetvmruncommands/predicates.go
@@ -12,7 +12,7 @@ type VirtualMachineRunCommandOperationPredicate struct {
 
 func (p VirtualMachineRunCommandOperationPredicate) Matches(input VirtualMachineRunCommand) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p VirtualMachineRunCommandOperationPredicate) Matches(input VirtualMachine
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2021-11-01/virtualmachinescalesetvms/predicates.go b/resource-manager/compute/2021-11-01/virtualmachinescalesetvms/predicates.go
index 23dd767b46e..6aaef8b22e0 100644
--- a/resource-manager/compute/2021-11-01/virtualmachinescalesetvms/predicates.go
+++ b/resource-manager/compute/2021-11-01/virtualmachinescalesetvms/predicates.go
@@ -13,11 +13,11 @@ type VirtualMachineScaleSetVMOperationPredicate struct {
 
 func (p VirtualMachineScaleSetVMOperationPredicate) Matches(input VirtualMachineScaleSetVM) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.InstanceId != nil && (input.InstanceId == nil && *p.InstanceId != *input.InstanceId) {
+	if p.InstanceId != nil && (input.InstanceId == nil || *p.InstanceId != *input.InstanceId) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p VirtualMachineScaleSetVMOperationPredicate) Matches(input VirtualMachine
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-01/availabilitysets/predicates.go b/resource-manager/compute/2022-03-01/availabilitysets/predicates.go
index 721d485954d..bb3e2b2b319 100644
--- a/resource-manager/compute/2022-03-01/availabilitysets/predicates.go
+++ b/resource-manager/compute/2022-03-01/availabilitysets/predicates.go
@@ -12,7 +12,7 @@ type AvailabilitySetOperationPredicate struct {
 
 func (p AvailabilitySetOperationPredicate) Matches(input AvailabilitySet) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p AvailabilitySetOperationPredicate) Matches(input AvailabilitySet) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-01/capacityreservation/predicates.go b/resource-manager/compute/2022-03-01/capacityreservation/predicates.go
index ec98941d7ba..b8a1f7fb332 100644
--- a/resource-manager/compute/2022-03-01/capacityreservation/predicates.go
+++ b/resource-manager/compute/2022-03-01/capacityreservation/predicates.go
@@ -12,7 +12,7 @@ type CapacityReservationOperationPredicate struct {
 
 func (p CapacityReservationOperationPredicate) Matches(input CapacityReservation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p CapacityReservationOperationPredicate) Matches(input CapacityReservation
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-01/capacityreservationgroups/predicates.go b/resource-manager/compute/2022-03-01/capacityreservationgroups/predicates.go
index 6e394496b4b..d33edd6ae80 100644
--- a/resource-manager/compute/2022-03-01/capacityreservationgroups/predicates.go
+++ b/resource-manager/compute/2022-03-01/capacityreservationgroups/predicates.go
@@ -12,7 +12,7 @@ type CapacityReservationGroupOperationPredicate struct {
 
 func (p CapacityReservationGroupOperationPredicate) Matches(input CapacityReservationGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p CapacityReservationGroupOperationPredicate) Matches(input CapacityReserv
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-01/dedicatedhost/predicates.go b/resource-manager/compute/2022-03-01/dedicatedhost/predicates.go
index 477a8351ed5..f3fee1b89c7 100644
--- a/resource-manager/compute/2022-03-01/dedicatedhost/predicates.go
+++ b/resource-manager/compute/2022-03-01/dedicatedhost/predicates.go
@@ -12,7 +12,7 @@ type DedicatedHostOperationPredicate struct {
 
 func (p DedicatedHostOperationPredicate) Matches(input DedicatedHost) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p DedicatedHostOperationPredicate) Matches(input DedicatedHost) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-01/dedicatedhostgroups/predicates.go b/resource-manager/compute/2022-03-01/dedicatedhostgroups/predicates.go
index 4e1f9627d8d..de1da527708 100644
--- a/resource-manager/compute/2022-03-01/dedicatedhostgroups/predicates.go
+++ b/resource-manager/compute/2022-03-01/dedicatedhostgroups/predicates.go
@@ -12,7 +12,7 @@ type DedicatedHostGroupOperationPredicate struct {
 
 func (p DedicatedHostGroupOperationPredicate) Matches(input DedicatedHostGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p DedicatedHostGroupOperationPredicate) Matches(input DedicatedHostGroup)
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-01/images/predicates.go b/resource-manager/compute/2022-03-01/images/predicates.go
index d77da3842cc..7d036d2c839 100644
--- a/resource-manager/compute/2022-03-01/images/predicates.go
+++ b/resource-manager/compute/2022-03-01/images/predicates.go
@@ -12,7 +12,7 @@ type ImageOperationPredicate struct {
 
 func (p ImageOperationPredicate) Matches(input Image) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ImageOperationPredicate) Matches(input Image) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-01/proximityplacementgroups/predicates.go b/resource-manager/compute/2022-03-01/proximityplacementgroups/predicates.go
index 0144daa9e99..3e0bc38e4a2 100644
--- a/resource-manager/compute/2022-03-01/proximityplacementgroups/predicates.go
+++ b/resource-manager/compute/2022-03-01/proximityplacementgroups/predicates.go
@@ -12,7 +12,7 @@ type ProximityPlacementGroupOperationPredicate struct {
 
 func (p ProximityPlacementGroupOperationPredicate) Matches(input ProximityPlacementGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ProximityPlacementGroupOperationPredicate) Matches(input ProximityPlacem
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-01/restorepointcollections/predicates.go b/resource-manager/compute/2022-03-01/restorepointcollections/predicates.go
index 57a6cda48ad..6f4eb007a65 100644
--- a/resource-manager/compute/2022-03-01/restorepointcollections/predicates.go
+++ b/resource-manager/compute/2022-03-01/restorepointcollections/predicates.go
@@ -12,7 +12,7 @@ type RestorePointCollectionOperationPredicate struct {
 
 func (p RestorePointCollectionOperationPredicate) Matches(input RestorePointCollection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p RestorePointCollectionOperationPredicate) Matches(input RestorePointColl
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-01/sshpublickeys/predicates.go b/resource-manager/compute/2022-03-01/sshpublickeys/predicates.go
index 41d8c1ef7fe..eafbb4400ce 100644
--- a/resource-manager/compute/2022-03-01/sshpublickeys/predicates.go
+++ b/resource-manager/compute/2022-03-01/sshpublickeys/predicates.go
@@ -12,7 +12,7 @@ type SshPublicKeyResourceOperationPredicate struct {
 
 func (p SshPublicKeyResourceOperationPredicate) Matches(input SshPublicKeyResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SshPublicKeyResourceOperationPredicate) Matches(input SshPublicKeyResour
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-01/virtualmachineruncommands/predicates.go b/resource-manager/compute/2022-03-01/virtualmachineruncommands/predicates.go
index b9cbb574d56..80b5a5e96e9 100644
--- a/resource-manager/compute/2022-03-01/virtualmachineruncommands/predicates.go
+++ b/resource-manager/compute/2022-03-01/virtualmachineruncommands/predicates.go
@@ -40,7 +40,7 @@ type VirtualMachineRunCommandOperationPredicate struct {
 
 func (p VirtualMachineRunCommandOperationPredicate) Matches(input VirtualMachineRunCommand) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -48,11 +48,11 @@ func (p VirtualMachineRunCommandOperationPredicate) Matches(input VirtualMachine
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-01/virtualmachines/predicates.go b/resource-manager/compute/2022-03-01/virtualmachines/predicates.go
index 87d934957d9..b6284a17521 100644
--- a/resource-manager/compute/2022-03-01/virtualmachines/predicates.go
+++ b/resource-manager/compute/2022-03-01/virtualmachines/predicates.go
@@ -12,7 +12,7 @@ type VirtualMachineOperationPredicate struct {
 
 func (p VirtualMachineOperationPredicate) Matches(input VirtualMachine) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p VirtualMachineOperationPredicate) Matches(input VirtualMachine) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-01/virtualmachinescalesetextensions/predicates.go b/resource-manager/compute/2022-03-01/virtualmachinescalesetextensions/predicates.go
index 6a10ea7965d..a03d9f7aa2b 100644
--- a/resource-manager/compute/2022-03-01/virtualmachinescalesetextensions/predicates.go
+++ b/resource-manager/compute/2022-03-01/virtualmachinescalesetextensions/predicates.go
@@ -11,15 +11,15 @@ type VirtualMachineScaleSetExtensionOperationPredicate struct {
 
 func (p VirtualMachineScaleSetExtensionOperationPredicate) Matches(input VirtualMachineScaleSetExtension) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-01/virtualmachinescalesets/predicates.go b/resource-manager/compute/2022-03-01/virtualmachinescalesets/predicates.go
index 755a7ee6173..d0f5a0f71b9 100644
--- a/resource-manager/compute/2022-03-01/virtualmachinescalesets/predicates.go
+++ b/resource-manager/compute/2022-03-01/virtualmachinescalesets/predicates.go
@@ -10,11 +10,11 @@ type UpgradeOperationHistoricalStatusInfoOperationPredicate struct {
 
 func (p UpgradeOperationHistoricalStatusInfoOperationPredicate) Matches(input UpgradeOperationHistoricalStatusInfo) bool {
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -30,7 +30,7 @@ type VirtualMachineScaleSetOperationPredicate struct {
 
 func (p VirtualMachineScaleSetOperationPredicate) Matches(input VirtualMachineScaleSet) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -38,11 +38,11 @@ func (p VirtualMachineScaleSetOperationPredicate) Matches(input VirtualMachineSc
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -55,7 +55,7 @@ type VirtualMachineScaleSetSkuOperationPredicate struct {
 
 func (p VirtualMachineScaleSetSkuOperationPredicate) Matches(input VirtualMachineScaleSetSku) bool {
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-01/virtualmachinescalesetvmruncommands/predicates.go b/resource-manager/compute/2022-03-01/virtualmachinescalesetvmruncommands/predicates.go
index d05e46253d3..3858937cfb3 100644
--- a/resource-manager/compute/2022-03-01/virtualmachinescalesetvmruncommands/predicates.go
+++ b/resource-manager/compute/2022-03-01/virtualmachinescalesetvmruncommands/predicates.go
@@ -12,7 +12,7 @@ type VirtualMachineRunCommandOperationPredicate struct {
 
 func (p VirtualMachineRunCommandOperationPredicate) Matches(input VirtualMachineRunCommand) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p VirtualMachineRunCommandOperationPredicate) Matches(input VirtualMachine
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-01/virtualmachinescalesetvms/predicates.go b/resource-manager/compute/2022-03-01/virtualmachinescalesetvms/predicates.go
index 23dd767b46e..6aaef8b22e0 100644
--- a/resource-manager/compute/2022-03-01/virtualmachinescalesetvms/predicates.go
+++ b/resource-manager/compute/2022-03-01/virtualmachinescalesetvms/predicates.go
@@ -13,11 +13,11 @@ type VirtualMachineScaleSetVMOperationPredicate struct {
 
 func (p VirtualMachineScaleSetVMOperationPredicate) Matches(input VirtualMachineScaleSetVM) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.InstanceId != nil && (input.InstanceId == nil && *p.InstanceId != *input.InstanceId) {
+	if p.InstanceId != nil && (input.InstanceId == nil || *p.InstanceId != *input.InstanceId) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p VirtualMachineScaleSetVMOperationPredicate) Matches(input VirtualMachine
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-02/diskaccesses/predicates.go b/resource-manager/compute/2022-03-02/diskaccesses/predicates.go
index ef24325161d..6dddd44f241 100644
--- a/resource-manager/compute/2022-03-02/diskaccesses/predicates.go
+++ b/resource-manager/compute/2022-03-02/diskaccesses/predicates.go
@@ -12,7 +12,7 @@ type DiskAccessOperationPredicate struct {
 
 func (p DiskAccessOperationPredicate) Matches(input DiskAccess) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p DiskAccessOperationPredicate) Matches(input DiskAccess) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -39,15 +39,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-02/diskencryptionsets/predicates.go b/resource-manager/compute/2022-03-02/diskencryptionsets/predicates.go
index 816e29afd20..2c9e83be8e8 100644
--- a/resource-manager/compute/2022-03-02/diskencryptionsets/predicates.go
+++ b/resource-manager/compute/2022-03-02/diskencryptionsets/predicates.go
@@ -12,7 +12,7 @@ type DiskEncryptionSetOperationPredicate struct {
 
 func (p DiskEncryptionSetOperationPredicate) Matches(input DiskEncryptionSet) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p DiskEncryptionSetOperationPredicate) Matches(input DiskEncryptionSet) bo
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-02/disks/predicates.go b/resource-manager/compute/2022-03-02/disks/predicates.go
index d35a46fcbd3..0c9aeb6430f 100644
--- a/resource-manager/compute/2022-03-02/disks/predicates.go
+++ b/resource-manager/compute/2022-03-02/disks/predicates.go
@@ -13,7 +13,7 @@ type DiskOperationPredicate struct {
 
 func (p DiskOperationPredicate) Matches(input Disk) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -21,15 +21,15 @@ func (p DiskOperationPredicate) Matches(input Disk) bool {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-02/incrementalrestorepoints/predicates.go b/resource-manager/compute/2022-03-02/incrementalrestorepoints/predicates.go
index e730126170b..5a64b564fcb 100644
--- a/resource-manager/compute/2022-03-02/incrementalrestorepoints/predicates.go
+++ b/resource-manager/compute/2022-03-02/incrementalrestorepoints/predicates.go
@@ -11,15 +11,15 @@ type DiskRestorePointOperationPredicate struct {
 
 func (p DiskRestorePointOperationPredicate) Matches(input DiskRestorePoint) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-02/snapshots/predicates.go b/resource-manager/compute/2022-03-02/snapshots/predicates.go
index b262bdf89bf..5a1fc520883 100644
--- a/resource-manager/compute/2022-03-02/snapshots/predicates.go
+++ b/resource-manager/compute/2022-03-02/snapshots/predicates.go
@@ -13,7 +13,7 @@ type SnapshotOperationPredicate struct {
 
 func (p SnapshotOperationPredicate) Matches(input Snapshot) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -21,15 +21,15 @@ func (p SnapshotOperationPredicate) Matches(input Snapshot) bool {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-03/communitygalleryimages/predicates.go b/resource-manager/compute/2022-03-03/communitygalleryimages/predicates.go
index 0290597756c..855bc092352 100644
--- a/resource-manager/compute/2022-03-03/communitygalleryimages/predicates.go
+++ b/resource-manager/compute/2022-03-03/communitygalleryimages/predicates.go
@@ -11,15 +11,15 @@ type CommunityGalleryImageOperationPredicate struct {
 
 func (p CommunityGalleryImageOperationPredicate) Matches(input CommunityGalleryImage) bool {
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-03/communitygalleryimageversions/predicates.go b/resource-manager/compute/2022-03-03/communitygalleryimageversions/predicates.go
index a59db9762e6..f78b71312f0 100644
--- a/resource-manager/compute/2022-03-03/communitygalleryimageversions/predicates.go
+++ b/resource-manager/compute/2022-03-03/communitygalleryimageversions/predicates.go
@@ -11,15 +11,15 @@ type CommunityGalleryImageVersionOperationPredicate struct {
 
 func (p CommunityGalleryImageVersionOperationPredicate) Matches(input CommunityGalleryImageVersion) bool {
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-03/galleries/predicates.go b/resource-manager/compute/2022-03-03/galleries/predicates.go
index 44607183b62..1d7b96c6b98 100644
--- a/resource-manager/compute/2022-03-03/galleries/predicates.go
+++ b/resource-manager/compute/2022-03-03/galleries/predicates.go
@@ -12,7 +12,7 @@ type GalleryOperationPredicate struct {
 
 func (p GalleryOperationPredicate) Matches(input Gallery) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p GalleryOperationPredicate) Matches(input Gallery) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-03/galleryapplications/predicates.go b/resource-manager/compute/2022-03-03/galleryapplications/predicates.go
index 9931a9255b6..fd795c85404 100644
--- a/resource-manager/compute/2022-03-03/galleryapplications/predicates.go
+++ b/resource-manager/compute/2022-03-03/galleryapplications/predicates.go
@@ -12,7 +12,7 @@ type GalleryApplicationOperationPredicate struct {
 
 func (p GalleryApplicationOperationPredicate) Matches(input GalleryApplication) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p GalleryApplicationOperationPredicate) Matches(input GalleryApplication)
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-03/galleryapplicationversions/predicates.go b/resource-manager/compute/2022-03-03/galleryapplicationversions/predicates.go
index 112939f59bc..430035d15e0 100644
--- a/resource-manager/compute/2022-03-03/galleryapplicationversions/predicates.go
+++ b/resource-manager/compute/2022-03-03/galleryapplicationversions/predicates.go
@@ -12,7 +12,7 @@ type GalleryApplicationVersionOperationPredicate struct {
 
 func (p GalleryApplicationVersionOperationPredicate) Matches(input GalleryApplicationVersion) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p GalleryApplicationVersionOperationPredicate) Matches(input GalleryApplic
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-03/galleryimages/predicates.go b/resource-manager/compute/2022-03-03/galleryimages/predicates.go
index 4711146859b..90c6e156593 100644
--- a/resource-manager/compute/2022-03-03/galleryimages/predicates.go
+++ b/resource-manager/compute/2022-03-03/galleryimages/predicates.go
@@ -12,7 +12,7 @@ type GalleryImageOperationPredicate struct {
 
 func (p GalleryImageOperationPredicate) Matches(input GalleryImage) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p GalleryImageOperationPredicate) Matches(input GalleryImage) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-03/galleryimageversions/predicates.go b/resource-manager/compute/2022-03-03/galleryimageversions/predicates.go
index 79778851879..bd9aebcaedf 100644
--- a/resource-manager/compute/2022-03-03/galleryimageversions/predicates.go
+++ b/resource-manager/compute/2022-03-03/galleryimageversions/predicates.go
@@ -12,7 +12,7 @@ type GalleryImageVersionOperationPredicate struct {
 
 func (p GalleryImageVersionOperationPredicate) Matches(input GalleryImageVersion) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p GalleryImageVersionOperationPredicate) Matches(input GalleryImageVersion
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-03/sharedgalleries/predicates.go b/resource-manager/compute/2022-03-03/sharedgalleries/predicates.go
index ecb3f898b03..0fd26798289 100644
--- a/resource-manager/compute/2022-03-03/sharedgalleries/predicates.go
+++ b/resource-manager/compute/2022-03-03/sharedgalleries/predicates.go
@@ -10,11 +10,11 @@ type PirSharedGalleryResourceOperationPredicate struct {
 
 func (p PirSharedGalleryResourceOperationPredicate) Matches(input PirSharedGalleryResource) bool {
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-03/sharedgalleryimages/predicates.go b/resource-manager/compute/2022-03-03/sharedgalleryimages/predicates.go
index 260dd352aff..8f40d3da095 100644
--- a/resource-manager/compute/2022-03-03/sharedgalleryimages/predicates.go
+++ b/resource-manager/compute/2022-03-03/sharedgalleryimages/predicates.go
@@ -10,11 +10,11 @@ type SharedGalleryImageOperationPredicate struct {
 
 func (p SharedGalleryImageOperationPredicate) Matches(input SharedGalleryImage) bool {
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/compute/2022-03-03/sharedgalleryimageversions/predicates.go b/resource-manager/compute/2022-03-03/sharedgalleryimageversions/predicates.go
index 3424313f495..9a9a98e50b0 100644
--- a/resource-manager/compute/2022-03-03/sharedgalleryimageversions/predicates.go
+++ b/resource-manager/compute/2022-03-03/sharedgalleryimageversions/predicates.go
@@ -10,11 +10,11 @@ type SharedGalleryImageVersionOperationPredicate struct {
 
 func (p SharedGalleryImageVersionOperationPredicate) Matches(input SharedGalleryImageVersion) bool {
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/confidentialledger/2022-05-13/confidentialledger/predicates.go b/resource-manager/confidentialledger/2022-05-13/confidentialledger/predicates.go
index 95f548887f5..077eac41cdf 100644
--- a/resource-manager/confidentialledger/2022-05-13/confidentialledger/predicates.go
+++ b/resource-manager/confidentialledger/2022-05-13/confidentialledger/predicates.go
@@ -12,19 +12,19 @@ type ConfidentialLedgerOperationPredicate struct {
 
 func (p ConfidentialLedgerOperationPredicate) Matches(input ConfidentialLedger) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/connectedvmware/2022-01-10-preview/clusters/predicates.go b/resource-manager/connectedvmware/2022-01-10-preview/clusters/predicates.go
index 0ca05cbcbb6..f697676777a 100644
--- a/resource-manager/connectedvmware/2022-01-10-preview/clusters/predicates.go
+++ b/resource-manager/connectedvmware/2022-01-10-preview/clusters/predicates.go
@@ -13,11 +13,11 @@ type ClusterOperationPredicate struct {
 
 func (p ClusterOperationPredicate) Matches(input Cluster) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p ClusterOperationPredicate) Matches(input Cluster) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/connectedvmware/2022-01-10-preview/datastores/predicates.go b/resource-manager/connectedvmware/2022-01-10-preview/datastores/predicates.go
index d1b1e6536ec..e2c15429e76 100644
--- a/resource-manager/connectedvmware/2022-01-10-preview/datastores/predicates.go
+++ b/resource-manager/connectedvmware/2022-01-10-preview/datastores/predicates.go
@@ -13,11 +13,11 @@ type DatastoreOperationPredicate struct {
 
 func (p DatastoreOperationPredicate) Matches(input Datastore) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p DatastoreOperationPredicate) Matches(input Datastore) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/connectedvmware/2022-01-10-preview/guestagents/predicates.go b/resource-manager/connectedvmware/2022-01-10-preview/guestagents/predicates.go
index 82e32a28b1f..f51a9dcf2c9 100644
--- a/resource-manager/connectedvmware/2022-01-10-preview/guestagents/predicates.go
+++ b/resource-manager/connectedvmware/2022-01-10-preview/guestagents/predicates.go
@@ -11,15 +11,15 @@ type GuestAgentOperationPredicate struct {
 
 func (p GuestAgentOperationPredicate) Matches(input GuestAgent) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/connectedvmware/2022-01-10-preview/hosts/predicates.go b/resource-manager/connectedvmware/2022-01-10-preview/hosts/predicates.go
index 063063b7df9..ab2992cdf31 100644
--- a/resource-manager/connectedvmware/2022-01-10-preview/hosts/predicates.go
+++ b/resource-manager/connectedvmware/2022-01-10-preview/hosts/predicates.go
@@ -13,11 +13,11 @@ type HostOperationPredicate struct {
 
 func (p HostOperationPredicate) Matches(input Host) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p HostOperationPredicate) Matches(input Host) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/connectedvmware/2022-01-10-preview/hybrididentitymetadata/predicates.go b/resource-manager/connectedvmware/2022-01-10-preview/hybrididentitymetadata/predicates.go
index 8f450f4ef93..5e9f9c439d5 100644
--- a/resource-manager/connectedvmware/2022-01-10-preview/hybrididentitymetadata/predicates.go
+++ b/resource-manager/connectedvmware/2022-01-10-preview/hybrididentitymetadata/predicates.go
@@ -11,15 +11,15 @@ type HybridIdentityMetadataOperationPredicate struct {
 
 func (p HybridIdentityMetadataOperationPredicate) Matches(input HybridIdentityMetadata) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/connectedvmware/2022-01-10-preview/inventoryitems/predicates.go b/resource-manager/connectedvmware/2022-01-10-preview/inventoryitems/predicates.go
index 40f65bad26a..228f404a376 100644
--- a/resource-manager/connectedvmware/2022-01-10-preview/inventoryitems/predicates.go
+++ b/resource-manager/connectedvmware/2022-01-10-preview/inventoryitems/predicates.go
@@ -12,19 +12,19 @@ type InventoryItemOperationPredicate struct {
 
 func (p InventoryItemOperationPredicate) Matches(input InventoryItem) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/connectedvmware/2022-01-10-preview/machineextensions/predicates.go b/resource-manager/connectedvmware/2022-01-10-preview/machineextensions/predicates.go
index c51fcc0a85f..cce57e0a67f 100644
--- a/resource-manager/connectedvmware/2022-01-10-preview/machineextensions/predicates.go
+++ b/resource-manager/connectedvmware/2022-01-10-preview/machineextensions/predicates.go
@@ -12,19 +12,19 @@ type MachineExtensionOperationPredicate struct {
 
 func (p MachineExtensionOperationPredicate) Matches(input MachineExtension) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/connectedvmware/2022-01-10-preview/resourcepools/predicates.go b/resource-manager/connectedvmware/2022-01-10-preview/resourcepools/predicates.go
index d526230451a..d1b9f4ac5de 100644
--- a/resource-manager/connectedvmware/2022-01-10-preview/resourcepools/predicates.go
+++ b/resource-manager/connectedvmware/2022-01-10-preview/resourcepools/predicates.go
@@ -13,11 +13,11 @@ type ResourcePoolOperationPredicate struct {
 
 func (p ResourcePoolOperationPredicate) Matches(input ResourcePool) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p ResourcePoolOperationPredicate) Matches(input ResourcePool) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/connectedvmware/2022-01-10-preview/vcenters/predicates.go b/resource-manager/connectedvmware/2022-01-10-preview/vcenters/predicates.go
index b09b4a366b7..18c08c33685 100644
--- a/resource-manager/connectedvmware/2022-01-10-preview/vcenters/predicates.go
+++ b/resource-manager/connectedvmware/2022-01-10-preview/vcenters/predicates.go
@@ -13,11 +13,11 @@ type VCenterOperationPredicate struct {
 
 func (p VCenterOperationPredicate) Matches(input VCenter) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p VCenterOperationPredicate) Matches(input VCenter) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/connectedvmware/2022-01-10-preview/virtualmachines/predicates.go b/resource-manager/connectedvmware/2022-01-10-preview/virtualmachines/predicates.go
index 0243eee0c56..4d14a460ecf 100644
--- a/resource-manager/connectedvmware/2022-01-10-preview/virtualmachines/predicates.go
+++ b/resource-manager/connectedvmware/2022-01-10-preview/virtualmachines/predicates.go
@@ -13,11 +13,11 @@ type VirtualMachineOperationPredicate struct {
 
 func (p VirtualMachineOperationPredicate) Matches(input VirtualMachine) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p VirtualMachineOperationPredicate) Matches(input VirtualMachine) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/connectedvmware/2022-01-10-preview/virtualmachinetemplates/predicates.go b/resource-manager/connectedvmware/2022-01-10-preview/virtualmachinetemplates/predicates.go
index 981ed99e5a1..cbc608a1cd4 100644
--- a/resource-manager/connectedvmware/2022-01-10-preview/virtualmachinetemplates/predicates.go
+++ b/resource-manager/connectedvmware/2022-01-10-preview/virtualmachinetemplates/predicates.go
@@ -13,11 +13,11 @@ type VirtualMachineTemplateOperationPredicate struct {
 
 func (p VirtualMachineTemplateOperationPredicate) Matches(input VirtualMachineTemplate) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p VirtualMachineTemplateOperationPredicate) Matches(input VirtualMachineTe
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/connectedvmware/2022-01-10-preview/virtualnetworks/predicates.go b/resource-manager/connectedvmware/2022-01-10-preview/virtualnetworks/predicates.go
index e5a07af40be..a70f81e7e7d 100644
--- a/resource-manager/connectedvmware/2022-01-10-preview/virtualnetworks/predicates.go
+++ b/resource-manager/connectedvmware/2022-01-10-preview/virtualnetworks/predicates.go
@@ -13,11 +13,11 @@ type VirtualNetworkOperationPredicate struct {
 
 func (p VirtualNetworkOperationPredicate) Matches(input VirtualNetwork) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p VirtualNetworkOperationPredicate) Matches(input VirtualNetwork) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2019-10-01/budgets/predicates.go b/resource-manager/consumption/2019-10-01/budgets/predicates.go
index 4c2570530b1..9810e731347 100644
--- a/resource-manager/consumption/2019-10-01/budgets/predicates.go
+++ b/resource-manager/consumption/2019-10-01/budgets/predicates.go
@@ -12,19 +12,19 @@ type BudgetOperationPredicate struct {
 
 func (p BudgetOperationPredicate) Matches(input Budget) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2019-10-01/events/predicates.go b/resource-manager/consumption/2019-10-01/events/predicates.go
index b2edd5a8e7d..4a8247b8589 100644
--- a/resource-manager/consumption/2019-10-01/events/predicates.go
+++ b/resource-manager/consumption/2019-10-01/events/predicates.go
@@ -12,19 +12,19 @@ type EventSummaryOperationPredicate struct {
 
 func (p EventSummaryOperationPredicate) Matches(input EventSummary) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2019-10-01/lots/predicates.go b/resource-manager/consumption/2019-10-01/lots/predicates.go
index 5ff4cc5526c..f05357b25a5 100644
--- a/resource-manager/consumption/2019-10-01/lots/predicates.go
+++ b/resource-manager/consumption/2019-10-01/lots/predicates.go
@@ -12,19 +12,19 @@ type LotSummaryOperationPredicate struct {
 
 func (p LotSummaryOperationPredicate) Matches(input LotSummary) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2019-10-01/marketplaces/predicates.go b/resource-manager/consumption/2019-10-01/marketplaces/predicates.go
index 5892b2697be..c9053f02335 100644
--- a/resource-manager/consumption/2019-10-01/marketplaces/predicates.go
+++ b/resource-manager/consumption/2019-10-01/marketplaces/predicates.go
@@ -12,19 +12,19 @@ type MarketplaceOperationPredicate struct {
 
 func (p MarketplaceOperationPredicate) Matches(input Marketplace) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2019-10-01/reservationdetails/predicates.go b/resource-manager/consumption/2019-10-01/reservationdetails/predicates.go
index 986124e67d3..e019223baa2 100644
--- a/resource-manager/consumption/2019-10-01/reservationdetails/predicates.go
+++ b/resource-manager/consumption/2019-10-01/reservationdetails/predicates.go
@@ -12,19 +12,19 @@ type ReservationDetailOperationPredicate struct {
 
 func (p ReservationDetailOperationPredicate) Matches(input ReservationDetail) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2019-10-01/reservationsummaries/predicates.go b/resource-manager/consumption/2019-10-01/reservationsummaries/predicates.go
index da67a88eef9..fd1f5cced24 100644
--- a/resource-manager/consumption/2019-10-01/reservationsummaries/predicates.go
+++ b/resource-manager/consumption/2019-10-01/reservationsummaries/predicates.go
@@ -12,19 +12,19 @@ type ReservationSummaryOperationPredicate struct {
 
 func (p ReservationSummaryOperationPredicate) Matches(input ReservationSummary) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2019-10-01/reservationtransactions/predicates.go b/resource-manager/consumption/2019-10-01/reservationtransactions/predicates.go
index 1d055aaa40f..6ed3035990b 100644
--- a/resource-manager/consumption/2019-10-01/reservationtransactions/predicates.go
+++ b/resource-manager/consumption/2019-10-01/reservationtransactions/predicates.go
@@ -11,15 +11,15 @@ type ModernReservationTransactionOperationPredicate struct {
 
 func (p ModernReservationTransactionOperationPredicate) Matches(input ModernReservationTransaction) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type ReservationTransactionOperationPredicate struct {
 
 func (p ReservationTransactionOperationPredicate) Matches(input ReservationTransaction) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2021-10-01/budgets/predicates.go b/resource-manager/consumption/2021-10-01/budgets/predicates.go
index 4c2570530b1..9810e731347 100644
--- a/resource-manager/consumption/2021-10-01/budgets/predicates.go
+++ b/resource-manager/consumption/2021-10-01/budgets/predicates.go
@@ -12,19 +12,19 @@ type BudgetOperationPredicate struct {
 
 func (p BudgetOperationPredicate) Matches(input Budget) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2021-10-01/events/predicates.go b/resource-manager/consumption/2021-10-01/events/predicates.go
index b2edd5a8e7d..4a8247b8589 100644
--- a/resource-manager/consumption/2021-10-01/events/predicates.go
+++ b/resource-manager/consumption/2021-10-01/events/predicates.go
@@ -12,19 +12,19 @@ type EventSummaryOperationPredicate struct {
 
 func (p EventSummaryOperationPredicate) Matches(input EventSummary) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2021-10-01/lots/predicates.go b/resource-manager/consumption/2021-10-01/lots/predicates.go
index 5ff4cc5526c..f05357b25a5 100644
--- a/resource-manager/consumption/2021-10-01/lots/predicates.go
+++ b/resource-manager/consumption/2021-10-01/lots/predicates.go
@@ -12,19 +12,19 @@ type LotSummaryOperationPredicate struct {
 
 func (p LotSummaryOperationPredicate) Matches(input LotSummary) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2021-10-01/marketplaces/predicates.go b/resource-manager/consumption/2021-10-01/marketplaces/predicates.go
index 5892b2697be..c9053f02335 100644
--- a/resource-manager/consumption/2021-10-01/marketplaces/predicates.go
+++ b/resource-manager/consumption/2021-10-01/marketplaces/predicates.go
@@ -12,19 +12,19 @@ type MarketplaceOperationPredicate struct {
 
 func (p MarketplaceOperationPredicate) Matches(input Marketplace) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2021-10-01/reservationdetails/predicates.go b/resource-manager/consumption/2021-10-01/reservationdetails/predicates.go
index c74aa3f712e..bef2cb2db57 100644
--- a/resource-manager/consumption/2021-10-01/reservationdetails/predicates.go
+++ b/resource-manager/consumption/2021-10-01/reservationdetails/predicates.go
@@ -12,19 +12,19 @@ type ReservationDetailOperationPredicate struct {
 
 func (p ReservationDetailOperationPredicate) Matches(input ReservationDetail) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2021-10-01/reservationsummaries/predicates.go b/resource-manager/consumption/2021-10-01/reservationsummaries/predicates.go
index 959abe0c4d7..6ffcb6050fa 100644
--- a/resource-manager/consumption/2021-10-01/reservationsummaries/predicates.go
+++ b/resource-manager/consumption/2021-10-01/reservationsummaries/predicates.go
@@ -12,19 +12,19 @@ type ReservationSummaryOperationPredicate struct {
 
 func (p ReservationSummaryOperationPredicate) Matches(input ReservationSummary) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2021-10-01/reservationtransactions/predicates.go b/resource-manager/consumption/2021-10-01/reservationtransactions/predicates.go
index 1d055aaa40f..6ed3035990b 100644
--- a/resource-manager/consumption/2021-10-01/reservationtransactions/predicates.go
+++ b/resource-manager/consumption/2021-10-01/reservationtransactions/predicates.go
@@ -11,15 +11,15 @@ type ModernReservationTransactionOperationPredicate struct {
 
 func (p ModernReservationTransactionOperationPredicate) Matches(input ModernReservationTransaction) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type ReservationTransactionOperationPredicate struct {
 
 func (p ReservationTransactionOperationPredicate) Matches(input ReservationTransaction) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2022-09-01/budgets/predicates.go b/resource-manager/consumption/2022-09-01/budgets/predicates.go
index 4c2570530b1..9810e731347 100644
--- a/resource-manager/consumption/2022-09-01/budgets/predicates.go
+++ b/resource-manager/consumption/2022-09-01/budgets/predicates.go
@@ -12,19 +12,19 @@ type BudgetOperationPredicate struct {
 
 func (p BudgetOperationPredicate) Matches(input Budget) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2022-09-01/events/predicates.go b/resource-manager/consumption/2022-09-01/events/predicates.go
index b2edd5a8e7d..4a8247b8589 100644
--- a/resource-manager/consumption/2022-09-01/events/predicates.go
+++ b/resource-manager/consumption/2022-09-01/events/predicates.go
@@ -12,19 +12,19 @@ type EventSummaryOperationPredicate struct {
 
 func (p EventSummaryOperationPredicate) Matches(input EventSummary) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2022-09-01/lots/predicates.go b/resource-manager/consumption/2022-09-01/lots/predicates.go
index 5ff4cc5526c..f05357b25a5 100644
--- a/resource-manager/consumption/2022-09-01/lots/predicates.go
+++ b/resource-manager/consumption/2022-09-01/lots/predicates.go
@@ -12,19 +12,19 @@ type LotSummaryOperationPredicate struct {
 
 func (p LotSummaryOperationPredicate) Matches(input LotSummary) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2022-09-01/marketplaces/predicates.go b/resource-manager/consumption/2022-09-01/marketplaces/predicates.go
index 5892b2697be..c9053f02335 100644
--- a/resource-manager/consumption/2022-09-01/marketplaces/predicates.go
+++ b/resource-manager/consumption/2022-09-01/marketplaces/predicates.go
@@ -12,19 +12,19 @@ type MarketplaceOperationPredicate struct {
 
 func (p MarketplaceOperationPredicate) Matches(input Marketplace) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2022-09-01/reservationdetails/predicates.go b/resource-manager/consumption/2022-09-01/reservationdetails/predicates.go
index c74aa3f712e..bef2cb2db57 100644
--- a/resource-manager/consumption/2022-09-01/reservationdetails/predicates.go
+++ b/resource-manager/consumption/2022-09-01/reservationdetails/predicates.go
@@ -12,19 +12,19 @@ type ReservationDetailOperationPredicate struct {
 
 func (p ReservationDetailOperationPredicate) Matches(input ReservationDetail) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2022-09-01/reservationsummaries/predicates.go b/resource-manager/consumption/2022-09-01/reservationsummaries/predicates.go
index 959abe0c4d7..6ffcb6050fa 100644
--- a/resource-manager/consumption/2022-09-01/reservationsummaries/predicates.go
+++ b/resource-manager/consumption/2022-09-01/reservationsummaries/predicates.go
@@ -12,19 +12,19 @@ type ReservationSummaryOperationPredicate struct {
 
 func (p ReservationSummaryOperationPredicate) Matches(input ReservationSummary) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2022-09-01/reservationtransactions/predicates.go b/resource-manager/consumption/2022-09-01/reservationtransactions/predicates.go
index 1d055aaa40f..6ed3035990b 100644
--- a/resource-manager/consumption/2022-09-01/reservationtransactions/predicates.go
+++ b/resource-manager/consumption/2022-09-01/reservationtransactions/predicates.go
@@ -11,15 +11,15 @@ type ModernReservationTransactionOperationPredicate struct {
 
 func (p ModernReservationTransactionOperationPredicate) Matches(input ModernReservationTransaction) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type ReservationTransactionOperationPredicate struct {
 
 func (p ReservationTransactionOperationPredicate) Matches(input ReservationTransaction) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2023-05-01/budgets/predicates.go b/resource-manager/consumption/2023-05-01/budgets/predicates.go
index 4c2570530b1..9810e731347 100644
--- a/resource-manager/consumption/2023-05-01/budgets/predicates.go
+++ b/resource-manager/consumption/2023-05-01/budgets/predicates.go
@@ -12,19 +12,19 @@ type BudgetOperationPredicate struct {
 
 func (p BudgetOperationPredicate) Matches(input Budget) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2023-05-01/events/predicates.go b/resource-manager/consumption/2023-05-01/events/predicates.go
index b2edd5a8e7d..4a8247b8589 100644
--- a/resource-manager/consumption/2023-05-01/events/predicates.go
+++ b/resource-manager/consumption/2023-05-01/events/predicates.go
@@ -12,19 +12,19 @@ type EventSummaryOperationPredicate struct {
 
 func (p EventSummaryOperationPredicate) Matches(input EventSummary) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2023-05-01/lots/predicates.go b/resource-manager/consumption/2023-05-01/lots/predicates.go
index 5ff4cc5526c..f05357b25a5 100644
--- a/resource-manager/consumption/2023-05-01/lots/predicates.go
+++ b/resource-manager/consumption/2023-05-01/lots/predicates.go
@@ -12,19 +12,19 @@ type LotSummaryOperationPredicate struct {
 
 func (p LotSummaryOperationPredicate) Matches(input LotSummary) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2023-05-01/marketplaces/predicates.go b/resource-manager/consumption/2023-05-01/marketplaces/predicates.go
index 5892b2697be..c9053f02335 100644
--- a/resource-manager/consumption/2023-05-01/marketplaces/predicates.go
+++ b/resource-manager/consumption/2023-05-01/marketplaces/predicates.go
@@ -12,19 +12,19 @@ type MarketplaceOperationPredicate struct {
 
 func (p MarketplaceOperationPredicate) Matches(input Marketplace) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2023-05-01/reservationdetails/predicates.go b/resource-manager/consumption/2023-05-01/reservationdetails/predicates.go
index c74aa3f712e..bef2cb2db57 100644
--- a/resource-manager/consumption/2023-05-01/reservationdetails/predicates.go
+++ b/resource-manager/consumption/2023-05-01/reservationdetails/predicates.go
@@ -12,19 +12,19 @@ type ReservationDetailOperationPredicate struct {
 
 func (p ReservationDetailOperationPredicate) Matches(input ReservationDetail) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2023-05-01/reservationsummaries/predicates.go b/resource-manager/consumption/2023-05-01/reservationsummaries/predicates.go
index 959abe0c4d7..6ffcb6050fa 100644
--- a/resource-manager/consumption/2023-05-01/reservationsummaries/predicates.go
+++ b/resource-manager/consumption/2023-05-01/reservationsummaries/predicates.go
@@ -12,19 +12,19 @@ type ReservationSummaryOperationPredicate struct {
 
 func (p ReservationSummaryOperationPredicate) Matches(input ReservationSummary) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/consumption/2023-05-01/reservationtransactions/predicates.go b/resource-manager/consumption/2023-05-01/reservationtransactions/predicates.go
index 1d055aaa40f..6ed3035990b 100644
--- a/resource-manager/consumption/2023-05-01/reservationtransactions/predicates.go
+++ b/resource-manager/consumption/2023-05-01/reservationtransactions/predicates.go
@@ -11,15 +11,15 @@ type ModernReservationTransactionOperationPredicate struct {
 
 func (p ModernReservationTransactionOperationPredicate) Matches(input ModernReservationTransaction) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type ReservationTransactionOperationPredicate struct {
 
 func (p ReservationTransactionOperationPredicate) Matches(input ReservationTransaction) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerapps/2022-03-01/certificates/predicates.go b/resource-manager/containerapps/2022-03-01/certificates/predicates.go
index e3fe371a5a6..2264c7e5419 100644
--- a/resource-manager/containerapps/2022-03-01/certificates/predicates.go
+++ b/resource-manager/containerapps/2022-03-01/certificates/predicates.go
@@ -12,7 +12,7 @@ type CertificateOperationPredicate struct {
 
 func (p CertificateOperationPredicate) Matches(input Certificate) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p CertificateOperationPredicate) Matches(input Certificate) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerapps/2022-03-01/containerapps/predicates.go b/resource-manager/containerapps/2022-03-01/containerapps/predicates.go
index ac5c271c2c4..c6d7b602461 100644
--- a/resource-manager/containerapps/2022-03-01/containerapps/predicates.go
+++ b/resource-manager/containerapps/2022-03-01/containerapps/predicates.go
@@ -12,7 +12,7 @@ type ContainerAppOperationPredicate struct {
 
 func (p ContainerAppOperationPredicate) Matches(input ContainerApp) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ContainerAppOperationPredicate) Matches(input ContainerApp) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerapps/2022-03-01/containerappsauthconfigs/predicates.go b/resource-manager/containerapps/2022-03-01/containerappsauthconfigs/predicates.go
index 0ddf88688c6..588139a3fbb 100644
--- a/resource-manager/containerapps/2022-03-01/containerappsauthconfigs/predicates.go
+++ b/resource-manager/containerapps/2022-03-01/containerappsauthconfigs/predicates.go
@@ -11,15 +11,15 @@ type AuthConfigOperationPredicate struct {
 
 func (p AuthConfigOperationPredicate) Matches(input AuthConfig) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerapps/2022-03-01/containerappsrevisions/predicates.go b/resource-manager/containerapps/2022-03-01/containerappsrevisions/predicates.go
index f6fe34741dd..264c9985b0d 100644
--- a/resource-manager/containerapps/2022-03-01/containerappsrevisions/predicates.go
+++ b/resource-manager/containerapps/2022-03-01/containerappsrevisions/predicates.go
@@ -11,15 +11,15 @@ type RevisionOperationPredicate struct {
 
 func (p RevisionOperationPredicate) Matches(input Revision) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerapps/2022-03-01/containerappssourcecontrols/predicates.go b/resource-manager/containerapps/2022-03-01/containerappssourcecontrols/predicates.go
index 4752e43b0b0..38f640c20f4 100644
--- a/resource-manager/containerapps/2022-03-01/containerappssourcecontrols/predicates.go
+++ b/resource-manager/containerapps/2022-03-01/containerappssourcecontrols/predicates.go
@@ -11,15 +11,15 @@ type SourceControlOperationPredicate struct {
 
 func (p SourceControlOperationPredicate) Matches(input SourceControl) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerapps/2022-03-01/daprcomponents/predicates.go b/resource-manager/containerapps/2022-03-01/daprcomponents/predicates.go
index 93af0974980..c623d167466 100644
--- a/resource-manager/containerapps/2022-03-01/daprcomponents/predicates.go
+++ b/resource-manager/containerapps/2022-03-01/daprcomponents/predicates.go
@@ -11,15 +11,15 @@ type DaprComponentOperationPredicate struct {
 
 func (p DaprComponentOperationPredicate) Matches(input DaprComponent) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerapps/2022-03-01/managedenvironments/predicates.go b/resource-manager/containerapps/2022-03-01/managedenvironments/predicates.go
index a553aa7afaa..8a7b008b49c 100644
--- a/resource-manager/containerapps/2022-03-01/managedenvironments/predicates.go
+++ b/resource-manager/containerapps/2022-03-01/managedenvironments/predicates.go
@@ -12,7 +12,7 @@ type CertificateOperationPredicate struct {
 
 func (p CertificateOperationPredicate) Matches(input Certificate) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p CertificateOperationPredicate) Matches(input Certificate) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,7 +40,7 @@ type ManagedEnvironmentOperationPredicate struct {
 
 func (p ManagedEnvironmentOperationPredicate) Matches(input ManagedEnvironment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -48,11 +48,11 @@ func (p ManagedEnvironmentOperationPredicate) Matches(input ManagedEnvironment)
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerapps/2022-11-01-preview/availableworkloadprofiles/predicates.go b/resource-manager/containerapps/2022-11-01-preview/availableworkloadprofiles/predicates.go
index 949923310ca..1639daf5d8b 100644
--- a/resource-manager/containerapps/2022-11-01-preview/availableworkloadprofiles/predicates.go
+++ b/resource-manager/containerapps/2022-11-01-preview/availableworkloadprofiles/predicates.go
@@ -12,19 +12,19 @@ type AvailableWorkloadProfileOperationPredicate struct {
 
 func (p AvailableWorkloadProfileOperationPredicate) Matches(input AvailableWorkloadProfile) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerapps/2022-11-01-preview/certificates/predicates.go b/resource-manager/containerapps/2022-11-01-preview/certificates/predicates.go
index e3fe371a5a6..2264c7e5419 100644
--- a/resource-manager/containerapps/2022-11-01-preview/certificates/predicates.go
+++ b/resource-manager/containerapps/2022-11-01-preview/certificates/predicates.go
@@ -12,7 +12,7 @@ type CertificateOperationPredicate struct {
 
 func (p CertificateOperationPredicate) Matches(input Certificate) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p CertificateOperationPredicate) Matches(input Certificate) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerapps/2022-11-01-preview/connectedenvironments/predicates.go b/resource-manager/containerapps/2022-11-01-preview/connectedenvironments/predicates.go
index 9837762ba73..56ab893afdf 100644
--- a/resource-manager/containerapps/2022-11-01-preview/connectedenvironments/predicates.go
+++ b/resource-manager/containerapps/2022-11-01-preview/connectedenvironments/predicates.go
@@ -12,7 +12,7 @@ type CertificateOperationPredicate struct {
 
 func (p CertificateOperationPredicate) Matches(input Certificate) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p CertificateOperationPredicate) Matches(input Certificate) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,7 +40,7 @@ type ConnectedEnvironmentOperationPredicate struct {
 
 func (p ConnectedEnvironmentOperationPredicate) Matches(input ConnectedEnvironment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -48,11 +48,11 @@ func (p ConnectedEnvironmentOperationPredicate) Matches(input ConnectedEnvironme
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerapps/2022-11-01-preview/containerapps/predicates.go b/resource-manager/containerapps/2022-11-01-preview/containerapps/predicates.go
index 38282c2c744..2f9822c394b 100644
--- a/resource-manager/containerapps/2022-11-01-preview/containerapps/predicates.go
+++ b/resource-manager/containerapps/2022-11-01-preview/containerapps/predicates.go
@@ -13,7 +13,7 @@ type ContainerAppOperationPredicate struct {
 
 func (p ContainerAppOperationPredicate) Matches(input ContainerApp) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -21,15 +21,15 @@ func (p ContainerAppOperationPredicate) Matches(input ContainerApp) bool {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -44,15 +44,15 @@ type DiagnosticsOperationPredicate struct {
 
 func (p DiagnosticsOperationPredicate) Matches(input Diagnostics) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -67,15 +67,15 @@ type RevisionOperationPredicate struct {
 
 func (p RevisionOperationPredicate) Matches(input Revision) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerapps/2022-11-01-preview/containerappsauthconfigs/predicates.go b/resource-manager/containerapps/2022-11-01-preview/containerappsauthconfigs/predicates.go
index 0ddf88688c6..588139a3fbb 100644
--- a/resource-manager/containerapps/2022-11-01-preview/containerappsauthconfigs/predicates.go
+++ b/resource-manager/containerapps/2022-11-01-preview/containerappsauthconfigs/predicates.go
@@ -11,15 +11,15 @@ type AuthConfigOperationPredicate struct {
 
 func (p AuthConfigOperationPredicate) Matches(input AuthConfig) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerapps/2022-11-01-preview/containerappsrevisions/predicates.go b/resource-manager/containerapps/2022-11-01-preview/containerappsrevisions/predicates.go
index f6fe34741dd..264c9985b0d 100644
--- a/resource-manager/containerapps/2022-11-01-preview/containerappsrevisions/predicates.go
+++ b/resource-manager/containerapps/2022-11-01-preview/containerappsrevisions/predicates.go
@@ -11,15 +11,15 @@ type RevisionOperationPredicate struct {
 
 func (p RevisionOperationPredicate) Matches(input Revision) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerapps/2022-11-01-preview/containerappssourcecontrols/predicates.go b/resource-manager/containerapps/2022-11-01-preview/containerappssourcecontrols/predicates.go
index 4752e43b0b0..38f640c20f4 100644
--- a/resource-manager/containerapps/2022-11-01-preview/containerappssourcecontrols/predicates.go
+++ b/resource-manager/containerapps/2022-11-01-preview/containerappssourcecontrols/predicates.go
@@ -11,15 +11,15 @@ type SourceControlOperationPredicate struct {
 
 func (p SourceControlOperationPredicate) Matches(input SourceControl) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerapps/2022-11-01-preview/daprcomponents/predicates.go b/resource-manager/containerapps/2022-11-01-preview/daprcomponents/predicates.go
index 93af0974980..c623d167466 100644
--- a/resource-manager/containerapps/2022-11-01-preview/daprcomponents/predicates.go
+++ b/resource-manager/containerapps/2022-11-01-preview/daprcomponents/predicates.go
@@ -11,15 +11,15 @@ type DaprComponentOperationPredicate struct {
 
 func (p DaprComponentOperationPredicate) Matches(input DaprComponent) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerapps/2022-11-01-preview/diagnostics/predicates.go b/resource-manager/containerapps/2022-11-01-preview/diagnostics/predicates.go
index 8ce7ec6fdc6..f8895351db6 100644
--- a/resource-manager/containerapps/2022-11-01-preview/diagnostics/predicates.go
+++ b/resource-manager/containerapps/2022-11-01-preview/diagnostics/predicates.go
@@ -11,15 +11,15 @@ type DiagnosticsOperationPredicate struct {
 
 func (p DiagnosticsOperationPredicate) Matches(input Diagnostics) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type RevisionOperationPredicate struct {
 
 func (p RevisionOperationPredicate) Matches(input Revision) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerapps/2022-11-01-preview/jobs/predicates.go b/resource-manager/containerapps/2022-11-01-preview/jobs/predicates.go
index ff7da43638b..d0d92bf8e31 100644
--- a/resource-manager/containerapps/2022-11-01-preview/jobs/predicates.go
+++ b/resource-manager/containerapps/2022-11-01-preview/jobs/predicates.go
@@ -12,7 +12,7 @@ type JobOperationPredicate struct {
 
 func (p JobOperationPredicate) Matches(input Job) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p JobOperationPredicate) Matches(input Job) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -41,23 +41,23 @@ type JobExecutionOperationPredicate struct {
 
 func (p JobExecutionOperationPredicate) Matches(input JobExecution) bool {
 
-	if p.EndTime != nil && (input.EndTime == nil && *p.EndTime != *input.EndTime) {
+	if p.EndTime != nil && (input.EndTime == nil || *p.EndTime != *input.EndTime) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.StartTime != nil && (input.StartTime == nil && *p.StartTime != *input.StartTime) {
+	if p.StartTime != nil && (input.StartTime == nil || *p.StartTime != *input.StartTime) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerapps/2022-11-01-preview/managedcertificates/predicates.go b/resource-manager/containerapps/2022-11-01-preview/managedcertificates/predicates.go
index ab102f99298..08e68d7dbf0 100644
--- a/resource-manager/containerapps/2022-11-01-preview/managedcertificates/predicates.go
+++ b/resource-manager/containerapps/2022-11-01-preview/managedcertificates/predicates.go
@@ -12,7 +12,7 @@ type ManagedCertificateOperationPredicate struct {
 
 func (p ManagedCertificateOperationPredicate) Matches(input ManagedCertificate) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ManagedCertificateOperationPredicate) Matches(input ManagedCertificate)
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerapps/2022-11-01-preview/managedenvironments/predicates.go b/resource-manager/containerapps/2022-11-01-preview/managedenvironments/predicates.go
index ea7b0cce724..4dd46763353 100644
--- a/resource-manager/containerapps/2022-11-01-preview/managedenvironments/predicates.go
+++ b/resource-manager/containerapps/2022-11-01-preview/managedenvironments/predicates.go
@@ -12,7 +12,7 @@ type CertificateOperationPredicate struct {
 
 func (p CertificateOperationPredicate) Matches(input Certificate) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p CertificateOperationPredicate) Matches(input Certificate) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,7 +40,7 @@ type ManagedCertificateOperationPredicate struct {
 
 func (p ManagedCertificateOperationPredicate) Matches(input ManagedCertificate) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -48,11 +48,11 @@ func (p ManagedCertificateOperationPredicate) Matches(input ManagedCertificate)
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -69,11 +69,11 @@ type ManagedEnvironmentOperationPredicate struct {
 
 func (p ManagedEnvironmentOperationPredicate) Matches(input ManagedEnvironment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -81,11 +81,11 @@ func (p ManagedEnvironmentOperationPredicate) Matches(input ManagedEnvironment)
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -100,15 +100,15 @@ type WorkloadProfileStatesOperationPredicate struct {
 
 func (p WorkloadProfileStatesOperationPredicate) Matches(input WorkloadProfileStates) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerinstance/2023-05-01/containerinstance/predicates.go b/resource-manager/containerinstance/2023-05-01/containerinstance/predicates.go
index d9f923921df..c71f6304ba8 100644
--- a/resource-manager/containerinstance/2023-05-01/containerinstance/predicates.go
+++ b/resource-manager/containerinstance/2023-05-01/containerinstance/predicates.go
@@ -31,23 +31,23 @@ type CapabilitiesOperationPredicate struct {
 
 func (p CapabilitiesOperationPredicate) Matches(input Capabilities) bool {
 
-	if p.Gpu != nil && (input.Gpu == nil && *p.Gpu != *input.Gpu) {
+	if p.Gpu != nil && (input.Gpu == nil || *p.Gpu != *input.Gpu) {
 		return false
 	}
 
-	if p.IPAddressType != nil && (input.IPAddressType == nil && *p.IPAddressType != *input.IPAddressType) {
+	if p.IPAddressType != nil && (input.IPAddressType == nil || *p.IPAddressType != *input.IPAddressType) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.OsType != nil && (input.OsType == nil && *p.OsType != *input.OsType) {
+	if p.OsType != nil && (input.OsType == nil || *p.OsType != *input.OsType) {
 		return false
 	}
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
@@ -63,19 +63,19 @@ type ContainerGroupOperationPredicate struct {
 
 func (p ContainerGroupOperationPredicate) Matches(input ContainerGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerregistry/2019-06-01-preview/agentpools/predicates.go b/resource-manager/containerregistry/2019-06-01-preview/agentpools/predicates.go
index 89954ccc938..7fbd375c2e2 100644
--- a/resource-manager/containerregistry/2019-06-01-preview/agentpools/predicates.go
+++ b/resource-manager/containerregistry/2019-06-01-preview/agentpools/predicates.go
@@ -12,7 +12,7 @@ type AgentPoolOperationPredicate struct {
 
 func (p AgentPoolOperationPredicate) Matches(input AgentPool) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p AgentPoolOperationPredicate) Matches(input AgentPool) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerregistry/2019-06-01-preview/runs/predicates.go b/resource-manager/containerregistry/2019-06-01-preview/runs/predicates.go
index 0c76b57adae..664af1cb25c 100644
--- a/resource-manager/containerregistry/2019-06-01-preview/runs/predicates.go
+++ b/resource-manager/containerregistry/2019-06-01-preview/runs/predicates.go
@@ -11,15 +11,15 @@ type RunOperationPredicate struct {
 
 func (p RunOperationPredicate) Matches(input Run) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerregistry/2019-06-01-preview/taskruns/predicates.go b/resource-manager/containerregistry/2019-06-01-preview/taskruns/predicates.go
index 06948ac6ca7..154c789ec2b 100644
--- a/resource-manager/containerregistry/2019-06-01-preview/taskruns/predicates.go
+++ b/resource-manager/containerregistry/2019-06-01-preview/taskruns/predicates.go
@@ -12,19 +12,19 @@ type TaskRunOperationPredicate struct {
 
 func (p TaskRunOperationPredicate) Matches(input TaskRun) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerregistry/2019-06-01-preview/tasks/predicates.go b/resource-manager/containerregistry/2019-06-01-preview/tasks/predicates.go
index e7d6f164587..e34fbcce9ec 100644
--- a/resource-manager/containerregistry/2019-06-01-preview/tasks/predicates.go
+++ b/resource-manager/containerregistry/2019-06-01-preview/tasks/predicates.go
@@ -12,7 +12,7 @@ type TaskOperationPredicate struct {
 
 func (p TaskOperationPredicate) Matches(input Task) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p TaskOperationPredicate) Matches(input Task) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerregistry/2021-08-01-preview/connectedregistries/predicates.go b/resource-manager/containerregistry/2021-08-01-preview/connectedregistries/predicates.go
index 8fe52ec09d1..4308d2cd178 100644
--- a/resource-manager/containerregistry/2021-08-01-preview/connectedregistries/predicates.go
+++ b/resource-manager/containerregistry/2021-08-01-preview/connectedregistries/predicates.go
@@ -11,15 +11,15 @@ type ConnectedRegistryOperationPredicate struct {
 
 func (p ConnectedRegistryOperationPredicate) Matches(input ConnectedRegistry) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerregistry/2021-08-01-preview/exportpipelines/predicates.go b/resource-manager/containerregistry/2021-08-01-preview/exportpipelines/predicates.go
index 4c37b957a72..f7a0a3584b0 100644
--- a/resource-manager/containerregistry/2021-08-01-preview/exportpipelines/predicates.go
+++ b/resource-manager/containerregistry/2021-08-01-preview/exportpipelines/predicates.go
@@ -12,19 +12,19 @@ type ExportPipelineOperationPredicate struct {
 
 func (p ExportPipelineOperationPredicate) Matches(input ExportPipeline) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerregistry/2021-08-01-preview/importpipelines/predicates.go b/resource-manager/containerregistry/2021-08-01-preview/importpipelines/predicates.go
index 1df3ed6c759..2d0ba9d965e 100644
--- a/resource-manager/containerregistry/2021-08-01-preview/importpipelines/predicates.go
+++ b/resource-manager/containerregistry/2021-08-01-preview/importpipelines/predicates.go
@@ -12,19 +12,19 @@ type ImportPipelineOperationPredicate struct {
 
 func (p ImportPipelineOperationPredicate) Matches(input ImportPipeline) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerregistry/2021-08-01-preview/pipelineruns/predicates.go b/resource-manager/containerregistry/2021-08-01-preview/pipelineruns/predicates.go
index cabf64be94d..4fd721a59b6 100644
--- a/resource-manager/containerregistry/2021-08-01-preview/pipelineruns/predicates.go
+++ b/resource-manager/containerregistry/2021-08-01-preview/pipelineruns/predicates.go
@@ -11,15 +11,15 @@ type PipelineRunOperationPredicate struct {
 
 func (p PipelineRunOperationPredicate) Matches(input PipelineRun) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerregistry/2021-08-01-preview/privateendpointconnections/predicates.go b/resource-manager/containerregistry/2021-08-01-preview/privateendpointconnections/predicates.go
index bea3f66b397..4a03a91ce52 100644
--- a/resource-manager/containerregistry/2021-08-01-preview/privateendpointconnections/predicates.go
+++ b/resource-manager/containerregistry/2021-08-01-preview/privateendpointconnections/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerregistry/2021-08-01-preview/registries/predicates.go b/resource-manager/containerregistry/2021-08-01-preview/registries/predicates.go
index 567b87782ed..2fd7c412260 100644
--- a/resource-manager/containerregistry/2021-08-01-preview/registries/predicates.go
+++ b/resource-manager/containerregistry/2021-08-01-preview/registries/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -35,7 +35,7 @@ type RegistryOperationPredicate struct {
 
 func (p RegistryOperationPredicate) Matches(input Registry) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -43,11 +43,11 @@ func (p RegistryOperationPredicate) Matches(input Registry) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerregistry/2021-08-01-preview/replications/predicates.go b/resource-manager/containerregistry/2021-08-01-preview/replications/predicates.go
index 4618f984b52..fbba0b6c312 100644
--- a/resource-manager/containerregistry/2021-08-01-preview/replications/predicates.go
+++ b/resource-manager/containerregistry/2021-08-01-preview/replications/predicates.go
@@ -12,7 +12,7 @@ type ReplicationOperationPredicate struct {
 
 func (p ReplicationOperationPredicate) Matches(input Replication) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ReplicationOperationPredicate) Matches(input Replication) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerregistry/2021-08-01-preview/scopemaps/predicates.go b/resource-manager/containerregistry/2021-08-01-preview/scopemaps/predicates.go
index 884cd9d2931..7ea335c428c 100644
--- a/resource-manager/containerregistry/2021-08-01-preview/scopemaps/predicates.go
+++ b/resource-manager/containerregistry/2021-08-01-preview/scopemaps/predicates.go
@@ -11,15 +11,15 @@ type ScopeMapOperationPredicate struct {
 
 func (p ScopeMapOperationPredicate) Matches(input ScopeMap) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerregistry/2021-08-01-preview/tokens/predicates.go b/resource-manager/containerregistry/2021-08-01-preview/tokens/predicates.go
index 54a2e8019db..e76d969798d 100644
--- a/resource-manager/containerregistry/2021-08-01-preview/tokens/predicates.go
+++ b/resource-manager/containerregistry/2021-08-01-preview/tokens/predicates.go
@@ -11,15 +11,15 @@ type TokenOperationPredicate struct {
 
 func (p TokenOperationPredicate) Matches(input Token) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerregistry/2021-08-01-preview/webhooks/predicates.go b/resource-manager/containerregistry/2021-08-01-preview/webhooks/predicates.go
index 56b942018f1..946905715c8 100644
--- a/resource-manager/containerregistry/2021-08-01-preview/webhooks/predicates.go
+++ b/resource-manager/containerregistry/2021-08-01-preview/webhooks/predicates.go
@@ -9,7 +9,7 @@ type EventOperationPredicate struct {
 
 func (p EventOperationPredicate) Matches(input Event) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,7 +25,7 @@ type WebhookOperationPredicate struct {
 
 func (p WebhookOperationPredicate) Matches(input Webhook) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -33,11 +33,11 @@ func (p WebhookOperationPredicate) Matches(input Webhook) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerregistry/2022-12-01/privateendpointconnections/predicates.go b/resource-manager/containerregistry/2022-12-01/privateendpointconnections/predicates.go
index bea3f66b397..4a03a91ce52 100644
--- a/resource-manager/containerregistry/2022-12-01/privateendpointconnections/predicates.go
+++ b/resource-manager/containerregistry/2022-12-01/privateendpointconnections/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerregistry/2022-12-01/registries/predicates.go b/resource-manager/containerregistry/2022-12-01/registries/predicates.go
index 567b87782ed..2fd7c412260 100644
--- a/resource-manager/containerregistry/2022-12-01/registries/predicates.go
+++ b/resource-manager/containerregistry/2022-12-01/registries/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -35,7 +35,7 @@ type RegistryOperationPredicate struct {
 
 func (p RegistryOperationPredicate) Matches(input Registry) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -43,11 +43,11 @@ func (p RegistryOperationPredicate) Matches(input Registry) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerregistry/2022-12-01/replications/predicates.go b/resource-manager/containerregistry/2022-12-01/replications/predicates.go
index 4618f984b52..fbba0b6c312 100644
--- a/resource-manager/containerregistry/2022-12-01/replications/predicates.go
+++ b/resource-manager/containerregistry/2022-12-01/replications/predicates.go
@@ -12,7 +12,7 @@ type ReplicationOperationPredicate struct {
 
 func (p ReplicationOperationPredicate) Matches(input Replication) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ReplicationOperationPredicate) Matches(input Replication) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerregistry/2022-12-01/scopemaps/predicates.go b/resource-manager/containerregistry/2022-12-01/scopemaps/predicates.go
index 884cd9d2931..7ea335c428c 100644
--- a/resource-manager/containerregistry/2022-12-01/scopemaps/predicates.go
+++ b/resource-manager/containerregistry/2022-12-01/scopemaps/predicates.go
@@ -11,15 +11,15 @@ type ScopeMapOperationPredicate struct {
 
 func (p ScopeMapOperationPredicate) Matches(input ScopeMap) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerregistry/2022-12-01/tokens/predicates.go b/resource-manager/containerregistry/2022-12-01/tokens/predicates.go
index 54a2e8019db..e76d969798d 100644
--- a/resource-manager/containerregistry/2022-12-01/tokens/predicates.go
+++ b/resource-manager/containerregistry/2022-12-01/tokens/predicates.go
@@ -11,15 +11,15 @@ type TokenOperationPredicate struct {
 
 func (p TokenOperationPredicate) Matches(input Token) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerregistry/2022-12-01/webhooks/predicates.go b/resource-manager/containerregistry/2022-12-01/webhooks/predicates.go
index 56b942018f1..946905715c8 100644
--- a/resource-manager/containerregistry/2022-12-01/webhooks/predicates.go
+++ b/resource-manager/containerregistry/2022-12-01/webhooks/predicates.go
@@ -9,7 +9,7 @@ type EventOperationPredicate struct {
 
 func (p EventOperationPredicate) Matches(input Event) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,7 +25,7 @@ type WebhookOperationPredicate struct {
 
 func (p WebhookOperationPredicate) Matches(input Webhook) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -33,11 +33,11 @@ func (p WebhookOperationPredicate) Matches(input Webhook) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerservice/2019-08-01/agentpools/predicates.go b/resource-manager/containerservice/2019-08-01/agentpools/predicates.go
index bc4f4f456d6..94a2db5c63b 100644
--- a/resource-manager/containerservice/2019-08-01/agentpools/predicates.go
+++ b/resource-manager/containerservice/2019-08-01/agentpools/predicates.go
@@ -11,15 +11,15 @@ type AgentPoolOperationPredicate struct {
 
 func (p AgentPoolOperationPredicate) Matches(input AgentPool) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerservice/2019-08-01/managedclusters/predicates.go b/resource-manager/containerservice/2019-08-01/managedclusters/predicates.go
index 1fab53b6c64..e76e04049b3 100644
--- a/resource-manager/containerservice/2019-08-01/managedclusters/predicates.go
+++ b/resource-manager/containerservice/2019-08-01/managedclusters/predicates.go
@@ -12,7 +12,7 @@ type ManagedClusterOperationPredicate struct {
 
 func (p ManagedClusterOperationPredicate) Matches(input ManagedCluster) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ManagedClusterOperationPredicate) Matches(input ManagedCluster) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerservice/2022-09-02-preview/agentpools/predicates.go b/resource-manager/containerservice/2022-09-02-preview/agentpools/predicates.go
index bc4f4f456d6..94a2db5c63b 100644
--- a/resource-manager/containerservice/2022-09-02-preview/agentpools/predicates.go
+++ b/resource-manager/containerservice/2022-09-02-preview/agentpools/predicates.go
@@ -11,15 +11,15 @@ type AgentPoolOperationPredicate struct {
 
 func (p AgentPoolOperationPredicate) Matches(input AgentPool) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerservice/2022-09-02-preview/fleetmembers/predicates.go b/resource-manager/containerservice/2022-09-02-preview/fleetmembers/predicates.go
index 453e8aa7489..944173ec74b 100644
--- a/resource-manager/containerservice/2022-09-02-preview/fleetmembers/predicates.go
+++ b/resource-manager/containerservice/2022-09-02-preview/fleetmembers/predicates.go
@@ -12,19 +12,19 @@ type FleetMemberOperationPredicate struct {
 
 func (p FleetMemberOperationPredicate) Matches(input FleetMember) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerservice/2022-09-02-preview/fleets/predicates.go b/resource-manager/containerservice/2022-09-02-preview/fleets/predicates.go
index a422a1d45d5..2e3f46e0dbb 100644
--- a/resource-manager/containerservice/2022-09-02-preview/fleets/predicates.go
+++ b/resource-manager/containerservice/2022-09-02-preview/fleets/predicates.go
@@ -13,11 +13,11 @@ type FleetOperationPredicate struct {
 
 func (p FleetOperationPredicate) Matches(input Fleet) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p FleetOperationPredicate) Matches(input Fleet) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerservice/2022-09-02-preview/maintenanceconfigurations/predicates.go b/resource-manager/containerservice/2022-09-02-preview/maintenanceconfigurations/predicates.go
index 937f6b41a58..c7eedb4fa7b 100644
--- a/resource-manager/containerservice/2022-09-02-preview/maintenanceconfigurations/predicates.go
+++ b/resource-manager/containerservice/2022-09-02-preview/maintenanceconfigurations/predicates.go
@@ -11,15 +11,15 @@ type MaintenanceConfigurationOperationPredicate struct {
 
 func (p MaintenanceConfigurationOperationPredicate) Matches(input MaintenanceConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerservice/2022-09-02-preview/managedclusters/predicates.go b/resource-manager/containerservice/2022-09-02-preview/managedclusters/predicates.go
index 9031c4ab52c..c2d99eb9b4b 100644
--- a/resource-manager/containerservice/2022-09-02-preview/managedclusters/predicates.go
+++ b/resource-manager/containerservice/2022-09-02-preview/managedclusters/predicates.go
@@ -12,7 +12,7 @@ type ManagedClusterOperationPredicate struct {
 
 func (p ManagedClusterOperationPredicate) Matches(input ManagedCluster) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ManagedClusterOperationPredicate) Matches(input ManagedCluster) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -37,7 +37,7 @@ type OutboundEnvironmentEndpointOperationPredicate struct {
 
 func (p OutboundEnvironmentEndpointOperationPredicate) Matches(input OutboundEnvironmentEndpoint) bool {
 
-	if p.Category != nil && (input.Category == nil && *p.Category != *input.Category) {
+	if p.Category != nil && (input.Category == nil || *p.Category != *input.Category) {
 		return false
 	}
 
diff --git a/resource-manager/containerservice/2022-09-02-preview/managedclustersnapshots/predicates.go b/resource-manager/containerservice/2022-09-02-preview/managedclustersnapshots/predicates.go
index 0a3a1abc48b..665969defbb 100644
--- a/resource-manager/containerservice/2022-09-02-preview/managedclustersnapshots/predicates.go
+++ b/resource-manager/containerservice/2022-09-02-preview/managedclustersnapshots/predicates.go
@@ -12,7 +12,7 @@ type ManagedClusterSnapshotOperationPredicate struct {
 
 func (p ManagedClusterSnapshotOperationPredicate) Matches(input ManagedClusterSnapshot) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ManagedClusterSnapshotOperationPredicate) Matches(input ManagedClusterSn
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerservice/2022-09-02-preview/snapshots/predicates.go b/resource-manager/containerservice/2022-09-02-preview/snapshots/predicates.go
index e2b6b4d636b..832503e3b26 100644
--- a/resource-manager/containerservice/2022-09-02-preview/snapshots/predicates.go
+++ b/resource-manager/containerservice/2022-09-02-preview/snapshots/predicates.go
@@ -12,7 +12,7 @@ type SnapshotOperationPredicate struct {
 
 func (p SnapshotOperationPredicate) Matches(input Snapshot) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SnapshotOperationPredicate) Matches(input Snapshot) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerservice/2022-09-02-preview/trustedaccess/predicates.go b/resource-manager/containerservice/2022-09-02-preview/trustedaccess/predicates.go
index c950b3e5bec..6bab96a78b7 100644
--- a/resource-manager/containerservice/2022-09-02-preview/trustedaccess/predicates.go
+++ b/resource-manager/containerservice/2022-09-02-preview/trustedaccess/predicates.go
@@ -10,11 +10,11 @@ type TrustedAccessRoleOperationPredicate struct {
 
 func (p TrustedAccessRoleOperationPredicate) Matches(input TrustedAccessRole) bool {
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.SourceResourceType != nil && (input.SourceResourceType == nil && *p.SourceResourceType != *input.SourceResourceType) {
+	if p.SourceResourceType != nil && (input.SourceResourceType == nil || *p.SourceResourceType != *input.SourceResourceType) {
 		return false
 	}
 
@@ -29,15 +29,15 @@ type TrustedAccessRoleBindingOperationPredicate struct {
 
 func (p TrustedAccessRoleBindingOperationPredicate) Matches(input TrustedAccessRoleBinding) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerservice/2023-03-02-preview/agentpools/predicates.go b/resource-manager/containerservice/2023-03-02-preview/agentpools/predicates.go
index bc4f4f456d6..94a2db5c63b 100644
--- a/resource-manager/containerservice/2023-03-02-preview/agentpools/predicates.go
+++ b/resource-manager/containerservice/2023-03-02-preview/agentpools/predicates.go
@@ -11,15 +11,15 @@ type AgentPoolOperationPredicate struct {
 
 func (p AgentPoolOperationPredicate) Matches(input AgentPool) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerservice/2023-03-02-preview/maintenanceconfigurations/predicates.go b/resource-manager/containerservice/2023-03-02-preview/maintenanceconfigurations/predicates.go
index 937f6b41a58..c7eedb4fa7b 100644
--- a/resource-manager/containerservice/2023-03-02-preview/maintenanceconfigurations/predicates.go
+++ b/resource-manager/containerservice/2023-03-02-preview/maintenanceconfigurations/predicates.go
@@ -11,15 +11,15 @@ type MaintenanceConfigurationOperationPredicate struct {
 
 func (p MaintenanceConfigurationOperationPredicate) Matches(input MaintenanceConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerservice/2023-03-02-preview/managedclusters/predicates.go b/resource-manager/containerservice/2023-03-02-preview/managedclusters/predicates.go
index 9031c4ab52c..c2d99eb9b4b 100644
--- a/resource-manager/containerservice/2023-03-02-preview/managedclusters/predicates.go
+++ b/resource-manager/containerservice/2023-03-02-preview/managedclusters/predicates.go
@@ -12,7 +12,7 @@ type ManagedClusterOperationPredicate struct {
 
 func (p ManagedClusterOperationPredicate) Matches(input ManagedCluster) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ManagedClusterOperationPredicate) Matches(input ManagedCluster) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -37,7 +37,7 @@ type OutboundEnvironmentEndpointOperationPredicate struct {
 
 func (p OutboundEnvironmentEndpointOperationPredicate) Matches(input OutboundEnvironmentEndpoint) bool {
 
-	if p.Category != nil && (input.Category == nil && *p.Category != *input.Category) {
+	if p.Category != nil && (input.Category == nil || *p.Category != *input.Category) {
 		return false
 	}
 
diff --git a/resource-manager/containerservice/2023-03-02-preview/managedclustersnapshots/predicates.go b/resource-manager/containerservice/2023-03-02-preview/managedclustersnapshots/predicates.go
index 0a3a1abc48b..665969defbb 100644
--- a/resource-manager/containerservice/2023-03-02-preview/managedclustersnapshots/predicates.go
+++ b/resource-manager/containerservice/2023-03-02-preview/managedclustersnapshots/predicates.go
@@ -12,7 +12,7 @@ type ManagedClusterSnapshotOperationPredicate struct {
 
 func (p ManagedClusterSnapshotOperationPredicate) Matches(input ManagedClusterSnapshot) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ManagedClusterSnapshotOperationPredicate) Matches(input ManagedClusterSn
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerservice/2023-03-02-preview/snapshots/predicates.go b/resource-manager/containerservice/2023-03-02-preview/snapshots/predicates.go
index e2b6b4d636b..832503e3b26 100644
--- a/resource-manager/containerservice/2023-03-02-preview/snapshots/predicates.go
+++ b/resource-manager/containerservice/2023-03-02-preview/snapshots/predicates.go
@@ -12,7 +12,7 @@ type SnapshotOperationPredicate struct {
 
 func (p SnapshotOperationPredicate) Matches(input Snapshot) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SnapshotOperationPredicate) Matches(input Snapshot) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerservice/2023-03-02-preview/trustedaccess/predicates.go b/resource-manager/containerservice/2023-03-02-preview/trustedaccess/predicates.go
index c950b3e5bec..6bab96a78b7 100644
--- a/resource-manager/containerservice/2023-03-02-preview/trustedaccess/predicates.go
+++ b/resource-manager/containerservice/2023-03-02-preview/trustedaccess/predicates.go
@@ -10,11 +10,11 @@ type TrustedAccessRoleOperationPredicate struct {
 
 func (p TrustedAccessRoleOperationPredicate) Matches(input TrustedAccessRole) bool {
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.SourceResourceType != nil && (input.SourceResourceType == nil && *p.SourceResourceType != *input.SourceResourceType) {
+	if p.SourceResourceType != nil && (input.SourceResourceType == nil || *p.SourceResourceType != *input.SourceResourceType) {
 		return false
 	}
 
@@ -29,15 +29,15 @@ type TrustedAccessRoleBindingOperationPredicate struct {
 
 func (p TrustedAccessRoleBindingOperationPredicate) Matches(input TrustedAccessRoleBinding) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerservice/2023-04-02-preview/agentpools/predicates.go b/resource-manager/containerservice/2023-04-02-preview/agentpools/predicates.go
index bc4f4f456d6..94a2db5c63b 100644
--- a/resource-manager/containerservice/2023-04-02-preview/agentpools/predicates.go
+++ b/resource-manager/containerservice/2023-04-02-preview/agentpools/predicates.go
@@ -11,15 +11,15 @@ type AgentPoolOperationPredicate struct {
 
 func (p AgentPoolOperationPredicate) Matches(input AgentPool) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerservice/2023-04-02-preview/maintenanceconfigurations/predicates.go b/resource-manager/containerservice/2023-04-02-preview/maintenanceconfigurations/predicates.go
index 937f6b41a58..c7eedb4fa7b 100644
--- a/resource-manager/containerservice/2023-04-02-preview/maintenanceconfigurations/predicates.go
+++ b/resource-manager/containerservice/2023-04-02-preview/maintenanceconfigurations/predicates.go
@@ -11,15 +11,15 @@ type MaintenanceConfigurationOperationPredicate struct {
 
 func (p MaintenanceConfigurationOperationPredicate) Matches(input MaintenanceConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerservice/2023-04-02-preview/managedclusters/predicates.go b/resource-manager/containerservice/2023-04-02-preview/managedclusters/predicates.go
index 9031c4ab52c..c2d99eb9b4b 100644
--- a/resource-manager/containerservice/2023-04-02-preview/managedclusters/predicates.go
+++ b/resource-manager/containerservice/2023-04-02-preview/managedclusters/predicates.go
@@ -12,7 +12,7 @@ type ManagedClusterOperationPredicate struct {
 
 func (p ManagedClusterOperationPredicate) Matches(input ManagedCluster) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ManagedClusterOperationPredicate) Matches(input ManagedCluster) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -37,7 +37,7 @@ type OutboundEnvironmentEndpointOperationPredicate struct {
 
 func (p OutboundEnvironmentEndpointOperationPredicate) Matches(input OutboundEnvironmentEndpoint) bool {
 
-	if p.Category != nil && (input.Category == nil && *p.Category != *input.Category) {
+	if p.Category != nil && (input.Category == nil || *p.Category != *input.Category) {
 		return false
 	}
 
diff --git a/resource-manager/containerservice/2023-04-02-preview/managedclustersnapshots/predicates.go b/resource-manager/containerservice/2023-04-02-preview/managedclustersnapshots/predicates.go
index 0a3a1abc48b..665969defbb 100644
--- a/resource-manager/containerservice/2023-04-02-preview/managedclustersnapshots/predicates.go
+++ b/resource-manager/containerservice/2023-04-02-preview/managedclustersnapshots/predicates.go
@@ -12,7 +12,7 @@ type ManagedClusterSnapshotOperationPredicate struct {
 
 func (p ManagedClusterSnapshotOperationPredicate) Matches(input ManagedClusterSnapshot) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ManagedClusterSnapshotOperationPredicate) Matches(input ManagedClusterSn
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerservice/2023-04-02-preview/snapshots/predicates.go b/resource-manager/containerservice/2023-04-02-preview/snapshots/predicates.go
index e2b6b4d636b..832503e3b26 100644
--- a/resource-manager/containerservice/2023-04-02-preview/snapshots/predicates.go
+++ b/resource-manager/containerservice/2023-04-02-preview/snapshots/predicates.go
@@ -12,7 +12,7 @@ type SnapshotOperationPredicate struct {
 
 func (p SnapshotOperationPredicate) Matches(input Snapshot) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SnapshotOperationPredicate) Matches(input Snapshot) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/containerservice/2023-04-02-preview/trustedaccess/predicates.go b/resource-manager/containerservice/2023-04-02-preview/trustedaccess/predicates.go
index c950b3e5bec..6bab96a78b7 100644
--- a/resource-manager/containerservice/2023-04-02-preview/trustedaccess/predicates.go
+++ b/resource-manager/containerservice/2023-04-02-preview/trustedaccess/predicates.go
@@ -10,11 +10,11 @@ type TrustedAccessRoleOperationPredicate struct {
 
 func (p TrustedAccessRoleOperationPredicate) Matches(input TrustedAccessRole) bool {
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.SourceResourceType != nil && (input.SourceResourceType == nil && *p.SourceResourceType != *input.SourceResourceType) {
+	if p.SourceResourceType != nil && (input.SourceResourceType == nil || *p.SourceResourceType != *input.SourceResourceType) {
 		return false
 	}
 
@@ -29,15 +29,15 @@ type TrustedAccessRoleBindingOperationPredicate struct {
 
 func (p TrustedAccessRoleBindingOperationPredicate) Matches(input TrustedAccessRoleBinding) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/costmanagement/2021-10-01/views/predicates.go b/resource-manager/costmanagement/2021-10-01/views/predicates.go
index d98e8488415..3e9567c4aad 100644
--- a/resource-manager/costmanagement/2021-10-01/views/predicates.go
+++ b/resource-manager/costmanagement/2021-10-01/views/predicates.go
@@ -12,19 +12,19 @@ type ViewOperationPredicate struct {
 
 func (p ViewOperationPredicate) Matches(input View) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/costmanagement/2022-06-01-preview/scheduledactions/predicates.go b/resource-manager/costmanagement/2022-06-01-preview/scheduledactions/predicates.go
index a44b72a528d..52f4f396ca3 100644
--- a/resource-manager/costmanagement/2022-06-01-preview/scheduledactions/predicates.go
+++ b/resource-manager/costmanagement/2022-06-01-preview/scheduledactions/predicates.go
@@ -12,19 +12,19 @@ type ScheduledActionOperationPredicate struct {
 
 func (p ScheduledActionOperationPredicate) Matches(input ScheduledAction) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/costmanagement/2022-10-01/benefitrecommendations/predicates.go b/resource-manager/costmanagement/2022-10-01/benefitrecommendations/predicates.go
index 346b5e69c65..aadbf9ab6c3 100644
--- a/resource-manager/costmanagement/2022-10-01/benefitrecommendations/predicates.go
+++ b/resource-manager/costmanagement/2022-10-01/benefitrecommendations/predicates.go
@@ -11,15 +11,15 @@ type BenefitRecommendationModelOperationPredicate struct {
 
 func (p BenefitRecommendationModelOperationPredicate) Matches(input BenefitRecommendationModel) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/costmanagement/2022-10-01/scheduledactions/predicates.go b/resource-manager/costmanagement/2022-10-01/scheduledactions/predicates.go
index a44b72a528d..52f4f396ca3 100644
--- a/resource-manager/costmanagement/2022-10-01/scheduledactions/predicates.go
+++ b/resource-manager/costmanagement/2022-10-01/scheduledactions/predicates.go
@@ -12,19 +12,19 @@ type ScheduledActionOperationPredicate struct {
 
 func (p ScheduledActionOperationPredicate) Matches(input ScheduledAction) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/costmanagement/2022-10-01/views/predicates.go b/resource-manager/costmanagement/2022-10-01/views/predicates.go
index d98e8488415..3e9567c4aad 100644
--- a/resource-manager/costmanagement/2022-10-01/views/predicates.go
+++ b/resource-manager/costmanagement/2022-10-01/views/predicates.go
@@ -12,19 +12,19 @@ type ViewOperationPredicate struct {
 
 func (p ViewOperationPredicate) Matches(input View) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/costmanagement/2023-03-01/benefitrecommendations/predicates.go b/resource-manager/costmanagement/2023-03-01/benefitrecommendations/predicates.go
index 346b5e69c65..aadbf9ab6c3 100644
--- a/resource-manager/costmanagement/2023-03-01/benefitrecommendations/predicates.go
+++ b/resource-manager/costmanagement/2023-03-01/benefitrecommendations/predicates.go
@@ -11,15 +11,15 @@ type BenefitRecommendationModelOperationPredicate struct {
 
 func (p BenefitRecommendationModelOperationPredicate) Matches(input BenefitRecommendationModel) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/costmanagement/2023-03-01/scheduledactions/predicates.go b/resource-manager/costmanagement/2023-03-01/scheduledactions/predicates.go
index a44b72a528d..52f4f396ca3 100644
--- a/resource-manager/costmanagement/2023-03-01/scheduledactions/predicates.go
+++ b/resource-manager/costmanagement/2023-03-01/scheduledactions/predicates.go
@@ -12,19 +12,19 @@ type ScheduledActionOperationPredicate struct {
 
 func (p ScheduledActionOperationPredicate) Matches(input ScheduledAction) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/costmanagement/2023-03-01/views/predicates.go b/resource-manager/costmanagement/2023-03-01/views/predicates.go
index d98e8488415..3e9567c4aad 100644
--- a/resource-manager/costmanagement/2023-03-01/views/predicates.go
+++ b/resource-manager/costmanagement/2023-03-01/views/predicates.go
@@ -12,19 +12,19 @@ type ViewOperationPredicate struct {
 
 func (p ViewOperationPredicate) Matches(input View) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/customproviders/2018-09-01-preview/associations/predicates.go b/resource-manager/customproviders/2018-09-01-preview/associations/predicates.go
index 4b85a328f89..ff274854753 100644
--- a/resource-manager/customproviders/2018-09-01-preview/associations/predicates.go
+++ b/resource-manager/customproviders/2018-09-01-preview/associations/predicates.go
@@ -11,15 +11,15 @@ type AssociationOperationPredicate struct {
 
 func (p AssociationOperationPredicate) Matches(input Association) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/customproviders/2018-09-01-preview/customresourceprovider/predicates.go b/resource-manager/customproviders/2018-09-01-preview/customresourceprovider/predicates.go
index 6ac509c4a32..50aa5bb0766 100644
--- a/resource-manager/customproviders/2018-09-01-preview/customresourceprovider/predicates.go
+++ b/resource-manager/customproviders/2018-09-01-preview/customresourceprovider/predicates.go
@@ -12,7 +12,7 @@ type CustomRPManifestOperationPredicate struct {
 
 func (p CustomRPManifestOperationPredicate) Matches(input CustomRPManifest) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p CustomRPManifestOperationPredicate) Matches(input CustomRPManifest) bool
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dashboard/2022-08-01/grafanaresource/predicates.go b/resource-manager/dashboard/2022-08-01/grafanaresource/predicates.go
index 62a6924f8a5..c49bf210e5a 100644
--- a/resource-manager/dashboard/2022-08-01/grafanaresource/predicates.go
+++ b/resource-manager/dashboard/2022-08-01/grafanaresource/predicates.go
@@ -12,19 +12,19 @@ type ManagedGrafanaOperationPredicate struct {
 
 func (p ManagedGrafanaOperationPredicate) Matches(input ManagedGrafana) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dashboard/2022-08-01/privateendpointconnection/predicates.go b/resource-manager/dashboard/2022-08-01/privateendpointconnection/predicates.go
index 15cbf456024..ed0e5025416 100644
--- a/resource-manager/dashboard/2022-08-01/privateendpointconnection/predicates.go
+++ b/resource-manager/dashboard/2022-08-01/privateendpointconnection/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dashboard/2022-08-01/privatelinkresource/predicates.go b/resource-manager/dashboard/2022-08-01/privatelinkresource/predicates.go
index 3455b0100fb..3392e26881e 100644
--- a/resource-manager/dashboard/2022-08-01/privatelinkresource/predicates.go
+++ b/resource-manager/dashboard/2022-08-01/privatelinkresource/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2022-03-01/alerts/predicates.go b/resource-manager/databoxedge/2022-03-01/alerts/predicates.go
index 7e860c845bb..8eae453a8b9 100644
--- a/resource-manager/databoxedge/2022-03-01/alerts/predicates.go
+++ b/resource-manager/databoxedge/2022-03-01/alerts/predicates.go
@@ -11,15 +11,15 @@ type AlertOperationPredicate struct {
 
 func (p AlertOperationPredicate) Matches(input Alert) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2022-03-01/availableskus/predicates.go b/resource-manager/databoxedge/2022-03-01/availableskus/predicates.go
index 303dd31d8f2..2b9cf5be8ef 100644
--- a/resource-manager/databoxedge/2022-03-01/availableskus/predicates.go
+++ b/resource-manager/databoxedge/2022-03-01/availableskus/predicates.go
@@ -12,19 +12,19 @@ type DataBoxEdgeSkuOperationPredicate struct {
 
 func (p DataBoxEdgeSkuOperationPredicate) Matches(input DataBoxEdgeSku) bool {
 
-	if p.Family != nil && (input.Family == nil && *p.Family != *input.Family) {
+	if p.Family != nil && (input.Family == nil || *p.Family != *input.Family) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
-	if p.Size != nil && (input.Size == nil && *p.Size != *input.Size) {
+	if p.Size != nil && (input.Size == nil || *p.Size != *input.Size) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2022-03-01/bandwidthschedules/predicates.go b/resource-manager/databoxedge/2022-03-01/bandwidthschedules/predicates.go
index 7b20baa1e90..2d139cfebc7 100644
--- a/resource-manager/databoxedge/2022-03-01/bandwidthschedules/predicates.go
+++ b/resource-manager/databoxedge/2022-03-01/bandwidthschedules/predicates.go
@@ -11,15 +11,15 @@ type BandwidthScheduleOperationPredicate struct {
 
 func (p BandwidthScheduleOperationPredicate) Matches(input BandwidthSchedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2022-03-01/containers/predicates.go b/resource-manager/databoxedge/2022-03-01/containers/predicates.go
index dff94d81e68..7367e2d8a21 100644
--- a/resource-manager/databoxedge/2022-03-01/containers/predicates.go
+++ b/resource-manager/databoxedge/2022-03-01/containers/predicates.go
@@ -11,15 +11,15 @@ type ContainerOperationPredicate struct {
 
 func (p ContainerOperationPredicate) Matches(input Container) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2022-03-01/devices/predicates.go b/resource-manager/databoxedge/2022-03-01/devices/predicates.go
index fb0aa157361..1fdddb96711 100644
--- a/resource-manager/databoxedge/2022-03-01/devices/predicates.go
+++ b/resource-manager/databoxedge/2022-03-01/devices/predicates.go
@@ -13,11 +13,11 @@ type DataBoxEdgeDeviceOperationPredicate struct {
 
 func (p DataBoxEdgeDeviceOperationPredicate) Matches(input DataBoxEdgeDevice) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p DataBoxEdgeDeviceOperationPredicate) Matches(input DataBoxEdgeDevice) bo
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2022-03-01/monitoringconfig/predicates.go b/resource-manager/databoxedge/2022-03-01/monitoringconfig/predicates.go
index e721390847c..9a6b2f8189e 100644
--- a/resource-manager/databoxedge/2022-03-01/monitoringconfig/predicates.go
+++ b/resource-manager/databoxedge/2022-03-01/monitoringconfig/predicates.go
@@ -11,15 +11,15 @@ type MonitoringMetricConfigurationOperationPredicate struct {
 
 func (p MonitoringMetricConfigurationOperationPredicate) Matches(input MonitoringMetricConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2022-03-01/nodes/predicates.go b/resource-manager/databoxedge/2022-03-01/nodes/predicates.go
index 349f601d970..7e88b022563 100644
--- a/resource-manager/databoxedge/2022-03-01/nodes/predicates.go
+++ b/resource-manager/databoxedge/2022-03-01/nodes/predicates.go
@@ -11,15 +11,15 @@ type NodeOperationPredicate struct {
 
 func (p NodeOperationPredicate) Matches(input Node) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2022-03-01/orders/predicates.go b/resource-manager/databoxedge/2022-03-01/orders/predicates.go
index 0c8df166b63..f8de350c431 100644
--- a/resource-manager/databoxedge/2022-03-01/orders/predicates.go
+++ b/resource-manager/databoxedge/2022-03-01/orders/predicates.go
@@ -12,19 +12,19 @@ type OrderOperationPredicate struct {
 
 func (p OrderOperationPredicate) Matches(input Order) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2022-03-01/shares/predicates.go b/resource-manager/databoxedge/2022-03-01/shares/predicates.go
index 970082aad57..e9785202fca 100644
--- a/resource-manager/databoxedge/2022-03-01/shares/predicates.go
+++ b/resource-manager/databoxedge/2022-03-01/shares/predicates.go
@@ -11,15 +11,15 @@ type ShareOperationPredicate struct {
 
 func (p ShareOperationPredicate) Matches(input Share) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2022-03-01/storageaccountcredentials/predicates.go b/resource-manager/databoxedge/2022-03-01/storageaccountcredentials/predicates.go
index d21c5b44a91..b5b738b35bf 100644
--- a/resource-manager/databoxedge/2022-03-01/storageaccountcredentials/predicates.go
+++ b/resource-manager/databoxedge/2022-03-01/storageaccountcredentials/predicates.go
@@ -11,15 +11,15 @@ type StorageAccountCredentialOperationPredicate struct {
 
 func (p StorageAccountCredentialOperationPredicate) Matches(input StorageAccountCredential) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2022-03-01/storageaccounts/predicates.go b/resource-manager/databoxedge/2022-03-01/storageaccounts/predicates.go
index 1741421006b..e394ae56b25 100644
--- a/resource-manager/databoxedge/2022-03-01/storageaccounts/predicates.go
+++ b/resource-manager/databoxedge/2022-03-01/storageaccounts/predicates.go
@@ -11,15 +11,15 @@ type StorageAccountOperationPredicate struct {
 
 func (p StorageAccountOperationPredicate) Matches(input StorageAccount) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2022-03-01/users/predicates.go b/resource-manager/databoxedge/2022-03-01/users/predicates.go
index 2a173699167..eb56f681fc0 100644
--- a/resource-manager/databoxedge/2022-03-01/users/predicates.go
+++ b/resource-manager/databoxedge/2022-03-01/users/predicates.go
@@ -11,15 +11,15 @@ type UserOperationPredicate struct {
 
 func (p UserOperationPredicate) Matches(input User) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2023-07-01/alerts/predicates.go b/resource-manager/databoxedge/2023-07-01/alerts/predicates.go
index 7e860c845bb..8eae453a8b9 100644
--- a/resource-manager/databoxedge/2023-07-01/alerts/predicates.go
+++ b/resource-manager/databoxedge/2023-07-01/alerts/predicates.go
@@ -11,15 +11,15 @@ type AlertOperationPredicate struct {
 
 func (p AlertOperationPredicate) Matches(input Alert) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2023-07-01/availableskus/predicates.go b/resource-manager/databoxedge/2023-07-01/availableskus/predicates.go
index 303dd31d8f2..2b9cf5be8ef 100644
--- a/resource-manager/databoxedge/2023-07-01/availableskus/predicates.go
+++ b/resource-manager/databoxedge/2023-07-01/availableskus/predicates.go
@@ -12,19 +12,19 @@ type DataBoxEdgeSkuOperationPredicate struct {
 
 func (p DataBoxEdgeSkuOperationPredicate) Matches(input DataBoxEdgeSku) bool {
 
-	if p.Family != nil && (input.Family == nil && *p.Family != *input.Family) {
+	if p.Family != nil && (input.Family == nil || *p.Family != *input.Family) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
-	if p.Size != nil && (input.Size == nil && *p.Size != *input.Size) {
+	if p.Size != nil && (input.Size == nil || *p.Size != *input.Size) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2023-07-01/bandwidthschedules/predicates.go b/resource-manager/databoxedge/2023-07-01/bandwidthschedules/predicates.go
index 7b20baa1e90..2d139cfebc7 100644
--- a/resource-manager/databoxedge/2023-07-01/bandwidthschedules/predicates.go
+++ b/resource-manager/databoxedge/2023-07-01/bandwidthschedules/predicates.go
@@ -11,15 +11,15 @@ type BandwidthScheduleOperationPredicate struct {
 
 func (p BandwidthScheduleOperationPredicate) Matches(input BandwidthSchedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2023-07-01/containers/predicates.go b/resource-manager/databoxedge/2023-07-01/containers/predicates.go
index dff94d81e68..7367e2d8a21 100644
--- a/resource-manager/databoxedge/2023-07-01/containers/predicates.go
+++ b/resource-manager/databoxedge/2023-07-01/containers/predicates.go
@@ -11,15 +11,15 @@ type ContainerOperationPredicate struct {
 
 func (p ContainerOperationPredicate) Matches(input Container) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2023-07-01/devices/predicates.go b/resource-manager/databoxedge/2023-07-01/devices/predicates.go
index fb0aa157361..1fdddb96711 100644
--- a/resource-manager/databoxedge/2023-07-01/devices/predicates.go
+++ b/resource-manager/databoxedge/2023-07-01/devices/predicates.go
@@ -13,11 +13,11 @@ type DataBoxEdgeDeviceOperationPredicate struct {
 
 func (p DataBoxEdgeDeviceOperationPredicate) Matches(input DataBoxEdgeDevice) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p DataBoxEdgeDeviceOperationPredicate) Matches(input DataBoxEdgeDevice) bo
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2023-07-01/monitoringconfig/predicates.go b/resource-manager/databoxedge/2023-07-01/monitoringconfig/predicates.go
index e721390847c..9a6b2f8189e 100644
--- a/resource-manager/databoxedge/2023-07-01/monitoringconfig/predicates.go
+++ b/resource-manager/databoxedge/2023-07-01/monitoringconfig/predicates.go
@@ -11,15 +11,15 @@ type MonitoringMetricConfigurationOperationPredicate struct {
 
 func (p MonitoringMetricConfigurationOperationPredicate) Matches(input MonitoringMetricConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2023-07-01/nodes/predicates.go b/resource-manager/databoxedge/2023-07-01/nodes/predicates.go
index 349f601d970..7e88b022563 100644
--- a/resource-manager/databoxedge/2023-07-01/nodes/predicates.go
+++ b/resource-manager/databoxedge/2023-07-01/nodes/predicates.go
@@ -11,15 +11,15 @@ type NodeOperationPredicate struct {
 
 func (p NodeOperationPredicate) Matches(input Node) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2023-07-01/orders/predicates.go b/resource-manager/databoxedge/2023-07-01/orders/predicates.go
index 0c8df166b63..f8de350c431 100644
--- a/resource-manager/databoxedge/2023-07-01/orders/predicates.go
+++ b/resource-manager/databoxedge/2023-07-01/orders/predicates.go
@@ -12,19 +12,19 @@ type OrderOperationPredicate struct {
 
 func (p OrderOperationPredicate) Matches(input Order) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2023-07-01/shares/predicates.go b/resource-manager/databoxedge/2023-07-01/shares/predicates.go
index 970082aad57..e9785202fca 100644
--- a/resource-manager/databoxedge/2023-07-01/shares/predicates.go
+++ b/resource-manager/databoxedge/2023-07-01/shares/predicates.go
@@ -11,15 +11,15 @@ type ShareOperationPredicate struct {
 
 func (p ShareOperationPredicate) Matches(input Share) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2023-07-01/storageaccountcredentials/predicates.go b/resource-manager/databoxedge/2023-07-01/storageaccountcredentials/predicates.go
index d21c5b44a91..b5b738b35bf 100644
--- a/resource-manager/databoxedge/2023-07-01/storageaccountcredentials/predicates.go
+++ b/resource-manager/databoxedge/2023-07-01/storageaccountcredentials/predicates.go
@@ -11,15 +11,15 @@ type StorageAccountCredentialOperationPredicate struct {
 
 func (p StorageAccountCredentialOperationPredicate) Matches(input StorageAccountCredential) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2023-07-01/storageaccounts/predicates.go b/resource-manager/databoxedge/2023-07-01/storageaccounts/predicates.go
index 1741421006b..e394ae56b25 100644
--- a/resource-manager/databoxedge/2023-07-01/storageaccounts/predicates.go
+++ b/resource-manager/databoxedge/2023-07-01/storageaccounts/predicates.go
@@ -11,15 +11,15 @@ type StorageAccountOperationPredicate struct {
 
 func (p StorageAccountOperationPredicate) Matches(input StorageAccount) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databoxedge/2023-07-01/users/predicates.go b/resource-manager/databoxedge/2023-07-01/users/predicates.go
index 2a173699167..eb56f681fc0 100644
--- a/resource-manager/databoxedge/2023-07-01/users/predicates.go
+++ b/resource-manager/databoxedge/2023-07-01/users/predicates.go
@@ -11,15 +11,15 @@ type UserOperationPredicate struct {
 
 func (p UserOperationPredicate) Matches(input User) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databricks/2022-04-01-preview/accessconnector/predicates.go b/resource-manager/databricks/2022-04-01-preview/accessconnector/predicates.go
index 3e947ec7bb4..4d1f4082039 100644
--- a/resource-manager/databricks/2022-04-01-preview/accessconnector/predicates.go
+++ b/resource-manager/databricks/2022-04-01-preview/accessconnector/predicates.go
@@ -12,7 +12,7 @@ type AccessConnectorOperationPredicate struct {
 
 func (p AccessConnectorOperationPredicate) Matches(input AccessConnector) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p AccessConnectorOperationPredicate) Matches(input AccessConnector) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databricks/2022-04-01-preview/privateendpointconnections/predicates.go b/resource-manager/databricks/2022-04-01-preview/privateendpointconnections/predicates.go
index bea3f66b397..4a03a91ce52 100644
--- a/resource-manager/databricks/2022-04-01-preview/privateendpointconnections/predicates.go
+++ b/resource-manager/databricks/2022-04-01-preview/privateendpointconnections/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databricks/2022-04-01-preview/privatelinkresources/predicates.go b/resource-manager/databricks/2022-04-01-preview/privatelinkresources/predicates.go
index 6d83dfbe71c..16f1098713f 100644
--- a/resource-manager/databricks/2022-04-01-preview/privatelinkresources/predicates.go
+++ b/resource-manager/databricks/2022-04-01-preview/privatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type GroupIdInformationOperationPredicate struct {
 
 func (p GroupIdInformationOperationPredicate) Matches(input GroupIdInformation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databricks/2022-04-01-preview/vnetpeering/predicates.go b/resource-manager/databricks/2022-04-01-preview/vnetpeering/predicates.go
index ac584153d30..bfbfcde0b68 100644
--- a/resource-manager/databricks/2022-04-01-preview/vnetpeering/predicates.go
+++ b/resource-manager/databricks/2022-04-01-preview/vnetpeering/predicates.go
@@ -11,15 +11,15 @@ type VirtualNetworkPeeringOperationPredicate struct {
 
 func (p VirtualNetworkPeeringOperationPredicate) Matches(input VirtualNetworkPeering) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databricks/2022-04-01-preview/workspaces/predicates.go b/resource-manager/databricks/2022-04-01-preview/workspaces/predicates.go
index 6c2de3aeddb..487159d40b2 100644
--- a/resource-manager/databricks/2022-04-01-preview/workspaces/predicates.go
+++ b/resource-manager/databricks/2022-04-01-preview/workspaces/predicates.go
@@ -12,7 +12,7 @@ type WorkspaceOperationPredicate struct {
 
 func (p WorkspaceOperationPredicate) Matches(input Workspace) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p WorkspaceOperationPredicate) Matches(input Workspace) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databricks/2022-10-01-preview/accessconnector/predicates.go b/resource-manager/databricks/2022-10-01-preview/accessconnector/predicates.go
index 3e947ec7bb4..4d1f4082039 100644
--- a/resource-manager/databricks/2022-10-01-preview/accessconnector/predicates.go
+++ b/resource-manager/databricks/2022-10-01-preview/accessconnector/predicates.go
@@ -12,7 +12,7 @@ type AccessConnectorOperationPredicate struct {
 
 func (p AccessConnectorOperationPredicate) Matches(input AccessConnector) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p AccessConnectorOperationPredicate) Matches(input AccessConnector) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databricks/2023-02-01/privateendpointconnections/predicates.go b/resource-manager/databricks/2023-02-01/privateendpointconnections/predicates.go
index bea3f66b397..4a03a91ce52 100644
--- a/resource-manager/databricks/2023-02-01/privateendpointconnections/predicates.go
+++ b/resource-manager/databricks/2023-02-01/privateendpointconnections/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databricks/2023-02-01/privatelinkresources/predicates.go b/resource-manager/databricks/2023-02-01/privatelinkresources/predicates.go
index 6d83dfbe71c..16f1098713f 100644
--- a/resource-manager/databricks/2023-02-01/privatelinkresources/predicates.go
+++ b/resource-manager/databricks/2023-02-01/privatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type GroupIdInformationOperationPredicate struct {
 
 func (p GroupIdInformationOperationPredicate) Matches(input GroupIdInformation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databricks/2023-02-01/vnetpeering/predicates.go b/resource-manager/databricks/2023-02-01/vnetpeering/predicates.go
index ac584153d30..bfbfcde0b68 100644
--- a/resource-manager/databricks/2023-02-01/vnetpeering/predicates.go
+++ b/resource-manager/databricks/2023-02-01/vnetpeering/predicates.go
@@ -11,15 +11,15 @@ type VirtualNetworkPeeringOperationPredicate struct {
 
 func (p VirtualNetworkPeeringOperationPredicate) Matches(input VirtualNetworkPeering) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databricks/2023-02-01/workspaces/predicates.go b/resource-manager/databricks/2023-02-01/workspaces/predicates.go
index 6c2de3aeddb..487159d40b2 100644
--- a/resource-manager/databricks/2023-02-01/workspaces/predicates.go
+++ b/resource-manager/databricks/2023-02-01/workspaces/predicates.go
@@ -12,7 +12,7 @@ type WorkspaceOperationPredicate struct {
 
 func (p WorkspaceOperationPredicate) Matches(input Workspace) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p WorkspaceOperationPredicate) Matches(input Workspace) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/databricks/2023-05-01/accessconnector/predicates.go b/resource-manager/databricks/2023-05-01/accessconnector/predicates.go
index 3e947ec7bb4..4d1f4082039 100644
--- a/resource-manager/databricks/2023-05-01/accessconnector/predicates.go
+++ b/resource-manager/databricks/2023-05-01/accessconnector/predicates.go
@@ -12,7 +12,7 @@ type AccessConnectorOperationPredicate struct {
 
 func (p AccessConnectorOperationPredicate) Matches(input AccessConnector) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p AccessConnectorOperationPredicate) Matches(input AccessConnector) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datadog/2021-03-01/agreements/predicates.go b/resource-manager/datadog/2021-03-01/agreements/predicates.go
index ad94d101a74..de8de760948 100644
--- a/resource-manager/datadog/2021-03-01/agreements/predicates.go
+++ b/resource-manager/datadog/2021-03-01/agreements/predicates.go
@@ -11,15 +11,15 @@ type DatadogAgreementResourceOperationPredicate struct {
 
 func (p DatadogAgreementResourceOperationPredicate) Matches(input DatadogAgreementResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datadog/2021-03-01/apikey/predicates.go b/resource-manager/datadog/2021-03-01/apikey/predicates.go
index 1000f35c29d..87f7ab5d1a2 100644
--- a/resource-manager/datadog/2021-03-01/apikey/predicates.go
+++ b/resource-manager/datadog/2021-03-01/apikey/predicates.go
@@ -12,11 +12,11 @@ type DatadogApiKeyOperationPredicate struct {
 
 func (p DatadogApiKeyOperationPredicate) Matches(input DatadogApiKey) bool {
 
-	if p.Created != nil && (input.Created == nil && *p.Created != *input.Created) {
+	if p.Created != nil && (input.Created == nil || *p.Created != *input.Created) {
 		return false
 	}
 
-	if p.CreatedBy != nil && (input.CreatedBy == nil && *p.CreatedBy != *input.CreatedBy) {
+	if p.CreatedBy != nil && (input.CreatedBy == nil || *p.CreatedBy != *input.CreatedBy) {
 		return false
 	}
 
@@ -24,7 +24,7 @@ func (p DatadogApiKeyOperationPredicate) Matches(input DatadogApiKey) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/datadog/2021-03-01/hosts/predicates.go b/resource-manager/datadog/2021-03-01/hosts/predicates.go
index 0ed9db921c1..35bb78eed8b 100644
--- a/resource-manager/datadog/2021-03-01/hosts/predicates.go
+++ b/resource-manager/datadog/2021-03-01/hosts/predicates.go
@@ -9,7 +9,7 @@ type DatadogHostOperationPredicate struct {
 
 func (p DatadogHostOperationPredicate) Matches(input DatadogHost) bool {
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/datadog/2021-03-01/linkedresources/predicates.go b/resource-manager/datadog/2021-03-01/linkedresources/predicates.go
index ed6fc5947d5..5cd8c05c33b 100644
--- a/resource-manager/datadog/2021-03-01/linkedresources/predicates.go
+++ b/resource-manager/datadog/2021-03-01/linkedresources/predicates.go
@@ -9,7 +9,7 @@ type LinkedResourceOperationPredicate struct {
 
 func (p LinkedResourceOperationPredicate) Matches(input LinkedResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
diff --git a/resource-manager/datadog/2021-03-01/monitoredresources/predicates.go b/resource-manager/datadog/2021-03-01/monitoredresources/predicates.go
index d7859aacf89..0797c7a22d6 100644
--- a/resource-manager/datadog/2021-03-01/monitoredresources/predicates.go
+++ b/resource-manager/datadog/2021-03-01/monitoredresources/predicates.go
@@ -13,23 +13,23 @@ type MonitoredResourceOperationPredicate struct {
 
 func (p MonitoredResourceOperationPredicate) Matches(input MonitoredResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.ReasonForLogsStatus != nil && (input.ReasonForLogsStatus == nil && *p.ReasonForLogsStatus != *input.ReasonForLogsStatus) {
+	if p.ReasonForLogsStatus != nil && (input.ReasonForLogsStatus == nil || *p.ReasonForLogsStatus != *input.ReasonForLogsStatus) {
 		return false
 	}
 
-	if p.ReasonForMetricsStatus != nil && (input.ReasonForMetricsStatus == nil && *p.ReasonForMetricsStatus != *input.ReasonForMetricsStatus) {
+	if p.ReasonForMetricsStatus != nil && (input.ReasonForMetricsStatus == nil || *p.ReasonForMetricsStatus != *input.ReasonForMetricsStatus) {
 		return false
 	}
 
-	if p.SendingLogs != nil && (input.SendingLogs == nil && *p.SendingLogs != *input.SendingLogs) {
+	if p.SendingLogs != nil && (input.SendingLogs == nil || *p.SendingLogs != *input.SendingLogs) {
 		return false
 	}
 
-	if p.SendingMetrics != nil && (input.SendingMetrics == nil && *p.SendingMetrics != *input.SendingMetrics) {
+	if p.SendingMetrics != nil && (input.SendingMetrics == nil || *p.SendingMetrics != *input.SendingMetrics) {
 		return false
 	}
 
diff --git a/resource-manager/datadog/2021-03-01/monitorsresource/predicates.go b/resource-manager/datadog/2021-03-01/monitorsresource/predicates.go
index 275df088932..a2ee22984f1 100644
--- a/resource-manager/datadog/2021-03-01/monitorsresource/predicates.go
+++ b/resource-manager/datadog/2021-03-01/monitorsresource/predicates.go
@@ -12,7 +12,7 @@ type DatadogMonitorResourceOperationPredicate struct {
 
 func (p DatadogMonitorResourceOperationPredicate) Matches(input DatadogMonitorResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p DatadogMonitorResourceOperationPredicate) Matches(input DatadogMonitorRe
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datadog/2021-03-01/rules/predicates.go b/resource-manager/datadog/2021-03-01/rules/predicates.go
index 78f6bbd6457..8052394d262 100644
--- a/resource-manager/datadog/2021-03-01/rules/predicates.go
+++ b/resource-manager/datadog/2021-03-01/rules/predicates.go
@@ -11,15 +11,15 @@ type MonitoringTagRulesOperationPredicate struct {
 
 func (p MonitoringTagRulesOperationPredicate) Matches(input MonitoringTagRules) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datadog/2021-03-01/singlesignon/predicates.go b/resource-manager/datadog/2021-03-01/singlesignon/predicates.go
index e631696fa7c..bc73bd31dd3 100644
--- a/resource-manager/datadog/2021-03-01/singlesignon/predicates.go
+++ b/resource-manager/datadog/2021-03-01/singlesignon/predicates.go
@@ -11,15 +11,15 @@ type DatadogSingleSignOnResourceOperationPredicate struct {
 
 func (p DatadogSingleSignOnResourceOperationPredicate) Matches(input DatadogSingleSignOnResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datadog/2022-06-01/agreements/predicates.go b/resource-manager/datadog/2022-06-01/agreements/predicates.go
index ad94d101a74..de8de760948 100644
--- a/resource-manager/datadog/2022-06-01/agreements/predicates.go
+++ b/resource-manager/datadog/2022-06-01/agreements/predicates.go
@@ -11,15 +11,15 @@ type DatadogAgreementResourceOperationPredicate struct {
 
 func (p DatadogAgreementResourceOperationPredicate) Matches(input DatadogAgreementResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datadog/2022-06-01/apikey/predicates.go b/resource-manager/datadog/2022-06-01/apikey/predicates.go
index 1000f35c29d..87f7ab5d1a2 100644
--- a/resource-manager/datadog/2022-06-01/apikey/predicates.go
+++ b/resource-manager/datadog/2022-06-01/apikey/predicates.go
@@ -12,11 +12,11 @@ type DatadogApiKeyOperationPredicate struct {
 
 func (p DatadogApiKeyOperationPredicate) Matches(input DatadogApiKey) bool {
 
-	if p.Created != nil && (input.Created == nil && *p.Created != *input.Created) {
+	if p.Created != nil && (input.Created == nil || *p.Created != *input.Created) {
 		return false
 	}
 
-	if p.CreatedBy != nil && (input.CreatedBy == nil && *p.CreatedBy != *input.CreatedBy) {
+	if p.CreatedBy != nil && (input.CreatedBy == nil || *p.CreatedBy != *input.CreatedBy) {
 		return false
 	}
 
@@ -24,7 +24,7 @@ func (p DatadogApiKeyOperationPredicate) Matches(input DatadogApiKey) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/datadog/2022-06-01/hosts/predicates.go b/resource-manager/datadog/2022-06-01/hosts/predicates.go
index 0ed9db921c1..35bb78eed8b 100644
--- a/resource-manager/datadog/2022-06-01/hosts/predicates.go
+++ b/resource-manager/datadog/2022-06-01/hosts/predicates.go
@@ -9,7 +9,7 @@ type DatadogHostOperationPredicate struct {
 
 func (p DatadogHostOperationPredicate) Matches(input DatadogHost) bool {
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/datadog/2022-06-01/linkedresources/predicates.go b/resource-manager/datadog/2022-06-01/linkedresources/predicates.go
index ed6fc5947d5..5cd8c05c33b 100644
--- a/resource-manager/datadog/2022-06-01/linkedresources/predicates.go
+++ b/resource-manager/datadog/2022-06-01/linkedresources/predicates.go
@@ -9,7 +9,7 @@ type LinkedResourceOperationPredicate struct {
 
 func (p LinkedResourceOperationPredicate) Matches(input LinkedResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
diff --git a/resource-manager/datadog/2022-06-01/monitoredresources/predicates.go b/resource-manager/datadog/2022-06-01/monitoredresources/predicates.go
index d7859aacf89..0797c7a22d6 100644
--- a/resource-manager/datadog/2022-06-01/monitoredresources/predicates.go
+++ b/resource-manager/datadog/2022-06-01/monitoredresources/predicates.go
@@ -13,23 +13,23 @@ type MonitoredResourceOperationPredicate struct {
 
 func (p MonitoredResourceOperationPredicate) Matches(input MonitoredResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.ReasonForLogsStatus != nil && (input.ReasonForLogsStatus == nil && *p.ReasonForLogsStatus != *input.ReasonForLogsStatus) {
+	if p.ReasonForLogsStatus != nil && (input.ReasonForLogsStatus == nil || *p.ReasonForLogsStatus != *input.ReasonForLogsStatus) {
 		return false
 	}
 
-	if p.ReasonForMetricsStatus != nil && (input.ReasonForMetricsStatus == nil && *p.ReasonForMetricsStatus != *input.ReasonForMetricsStatus) {
+	if p.ReasonForMetricsStatus != nil && (input.ReasonForMetricsStatus == nil || *p.ReasonForMetricsStatus != *input.ReasonForMetricsStatus) {
 		return false
 	}
 
-	if p.SendingLogs != nil && (input.SendingLogs == nil && *p.SendingLogs != *input.SendingLogs) {
+	if p.SendingLogs != nil && (input.SendingLogs == nil || *p.SendingLogs != *input.SendingLogs) {
 		return false
 	}
 
-	if p.SendingMetrics != nil && (input.SendingMetrics == nil && *p.SendingMetrics != *input.SendingMetrics) {
+	if p.SendingMetrics != nil && (input.SendingMetrics == nil || *p.SendingMetrics != *input.SendingMetrics) {
 		return false
 	}
 
diff --git a/resource-manager/datadog/2022-06-01/monitorsresource/predicates.go b/resource-manager/datadog/2022-06-01/monitorsresource/predicates.go
index 275df088932..a2ee22984f1 100644
--- a/resource-manager/datadog/2022-06-01/monitorsresource/predicates.go
+++ b/resource-manager/datadog/2022-06-01/monitorsresource/predicates.go
@@ -12,7 +12,7 @@ type DatadogMonitorResourceOperationPredicate struct {
 
 func (p DatadogMonitorResourceOperationPredicate) Matches(input DatadogMonitorResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p DatadogMonitorResourceOperationPredicate) Matches(input DatadogMonitorRe
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datadog/2022-06-01/rules/predicates.go b/resource-manager/datadog/2022-06-01/rules/predicates.go
index 78f6bbd6457..8052394d262 100644
--- a/resource-manager/datadog/2022-06-01/rules/predicates.go
+++ b/resource-manager/datadog/2022-06-01/rules/predicates.go
@@ -11,15 +11,15 @@ type MonitoringTagRulesOperationPredicate struct {
 
 func (p MonitoringTagRulesOperationPredicate) Matches(input MonitoringTagRules) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datadog/2022-06-01/singlesignon/predicates.go b/resource-manager/datadog/2022-06-01/singlesignon/predicates.go
index e631696fa7c..bc73bd31dd3 100644
--- a/resource-manager/datadog/2022-06-01/singlesignon/predicates.go
+++ b/resource-manager/datadog/2022-06-01/singlesignon/predicates.go
@@ -11,15 +11,15 @@ type DatadogSingleSignOnResourceOperationPredicate struct {
 
 func (p DatadogSingleSignOnResourceOperationPredicate) Matches(input DatadogSingleSignOnResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datafactory/2018-06-01/changedatacapture/predicates.go b/resource-manager/datafactory/2018-06-01/changedatacapture/predicates.go
index fab6db447dc..71282c97ed8 100644
--- a/resource-manager/datafactory/2018-06-01/changedatacapture/predicates.go
+++ b/resource-manager/datafactory/2018-06-01/changedatacapture/predicates.go
@@ -12,19 +12,19 @@ type ChangeDataCaptureResourceOperationPredicate struct {
 
 func (p ChangeDataCaptureResourceOperationPredicate) Matches(input ChangeDataCaptureResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datafactory/2018-06-01/credentials/predicates.go b/resource-manager/datafactory/2018-06-01/credentials/predicates.go
index 0602b47fa82..b0f15d4d51b 100644
--- a/resource-manager/datafactory/2018-06-01/credentials/predicates.go
+++ b/resource-manager/datafactory/2018-06-01/credentials/predicates.go
@@ -12,19 +12,19 @@ type ManagedIdentityCredentialResourceOperationPredicate struct {
 
 func (p ManagedIdentityCredentialResourceOperationPredicate) Matches(input ManagedIdentityCredentialResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datafactory/2018-06-01/dataflowdebugsession/predicates.go b/resource-manager/datafactory/2018-06-01/dataflowdebugsession/predicates.go
index 16c9c35ab2a..d9553acd46b 100644
--- a/resource-manager/datafactory/2018-06-01/dataflowdebugsession/predicates.go
+++ b/resource-manager/datafactory/2018-06-01/dataflowdebugsession/predicates.go
@@ -17,39 +17,39 @@ type DataFlowDebugSessionInfoOperationPredicate struct {
 
 func (p DataFlowDebugSessionInfoOperationPredicate) Matches(input DataFlowDebugSessionInfo) bool {
 
-	if p.ComputeType != nil && (input.ComputeType == nil && *p.ComputeType != *input.ComputeType) {
+	if p.ComputeType != nil && (input.ComputeType == nil || *p.ComputeType != *input.ComputeType) {
 		return false
 	}
 
-	if p.CoreCount != nil && (input.CoreCount == nil && *p.CoreCount != *input.CoreCount) {
+	if p.CoreCount != nil && (input.CoreCount == nil || *p.CoreCount != *input.CoreCount) {
 		return false
 	}
 
-	if p.DataFlowName != nil && (input.DataFlowName == nil && *p.DataFlowName != *input.DataFlowName) {
+	if p.DataFlowName != nil && (input.DataFlowName == nil || *p.DataFlowName != *input.DataFlowName) {
 		return false
 	}
 
-	if p.IntegrationRuntimeName != nil && (input.IntegrationRuntimeName == nil && *p.IntegrationRuntimeName != *input.IntegrationRuntimeName) {
+	if p.IntegrationRuntimeName != nil && (input.IntegrationRuntimeName == nil || *p.IntegrationRuntimeName != *input.IntegrationRuntimeName) {
 		return false
 	}
 
-	if p.LastActivityTime != nil && (input.LastActivityTime == nil && *p.LastActivityTime != *input.LastActivityTime) {
+	if p.LastActivityTime != nil && (input.LastActivityTime == nil || *p.LastActivityTime != *input.LastActivityTime) {
 		return false
 	}
 
-	if p.NodeCount != nil && (input.NodeCount == nil && *p.NodeCount != *input.NodeCount) {
+	if p.NodeCount != nil && (input.NodeCount == nil || *p.NodeCount != *input.NodeCount) {
 		return false
 	}
 
-	if p.SessionId != nil && (input.SessionId == nil && *p.SessionId != *input.SessionId) {
+	if p.SessionId != nil && (input.SessionId == nil || *p.SessionId != *input.SessionId) {
 		return false
 	}
 
-	if p.StartTime != nil && (input.StartTime == nil && *p.StartTime != *input.StartTime) {
+	if p.StartTime != nil && (input.StartTime == nil || *p.StartTime != *input.StartTime) {
 		return false
 	}
 
-	if p.TimeToLiveInMinutes != nil && (input.TimeToLiveInMinutes == nil && *p.TimeToLiveInMinutes != *input.TimeToLiveInMinutes) {
+	if p.TimeToLiveInMinutes != nil && (input.TimeToLiveInMinutes == nil || *p.TimeToLiveInMinutes != *input.TimeToLiveInMinutes) {
 		return false
 	}
 
diff --git a/resource-manager/datafactory/2018-06-01/dataflows/predicates.go b/resource-manager/datafactory/2018-06-01/dataflows/predicates.go
index acb096a9d1f..fcf9a41cb5d 100644
--- a/resource-manager/datafactory/2018-06-01/dataflows/predicates.go
+++ b/resource-manager/datafactory/2018-06-01/dataflows/predicates.go
@@ -12,19 +12,19 @@ type DataFlowResourceOperationPredicate struct {
 
 func (p DataFlowResourceOperationPredicate) Matches(input DataFlowResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datafactory/2018-06-01/datasets/predicates.go b/resource-manager/datafactory/2018-06-01/datasets/predicates.go
index 64c512616b8..43c702bafaf 100644
--- a/resource-manager/datafactory/2018-06-01/datasets/predicates.go
+++ b/resource-manager/datafactory/2018-06-01/datasets/predicates.go
@@ -12,19 +12,19 @@ type DatasetResourceOperationPredicate struct {
 
 func (p DatasetResourceOperationPredicate) Matches(input DatasetResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datafactory/2018-06-01/factories/predicates.go b/resource-manager/datafactory/2018-06-01/factories/predicates.go
index 0acd27af107..3b782f30df4 100644
--- a/resource-manager/datafactory/2018-06-01/factories/predicates.go
+++ b/resource-manager/datafactory/2018-06-01/factories/predicates.go
@@ -13,23 +13,23 @@ type FactoryOperationPredicate struct {
 
 func (p FactoryOperationPredicate) Matches(input Factory) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datafactory/2018-06-01/globalparameters/predicates.go b/resource-manager/datafactory/2018-06-01/globalparameters/predicates.go
index a91342ab9fc..3ce98cd946a 100644
--- a/resource-manager/datafactory/2018-06-01/globalparameters/predicates.go
+++ b/resource-manager/datafactory/2018-06-01/globalparameters/predicates.go
@@ -12,19 +12,19 @@ type GlobalParameterResourceOperationPredicate struct {
 
 func (p GlobalParameterResourceOperationPredicate) Matches(input GlobalParameterResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datafactory/2018-06-01/integrationruntimes/predicates.go b/resource-manager/datafactory/2018-06-01/integrationruntimes/predicates.go
index 349be2223f5..f9ec2d17dc2 100644
--- a/resource-manager/datafactory/2018-06-01/integrationruntimes/predicates.go
+++ b/resource-manager/datafactory/2018-06-01/integrationruntimes/predicates.go
@@ -12,19 +12,19 @@ type IntegrationRuntimeResourceOperationPredicate struct {
 
 func (p IntegrationRuntimeResourceOperationPredicate) Matches(input IntegrationRuntimeResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datafactory/2018-06-01/linkedservices/predicates.go b/resource-manager/datafactory/2018-06-01/linkedservices/predicates.go
index ccd6a6c327b..38e8b8d9a01 100644
--- a/resource-manager/datafactory/2018-06-01/linkedservices/predicates.go
+++ b/resource-manager/datafactory/2018-06-01/linkedservices/predicates.go
@@ -12,19 +12,19 @@ type LinkedServiceResourceOperationPredicate struct {
 
 func (p LinkedServiceResourceOperationPredicate) Matches(input LinkedServiceResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datafactory/2018-06-01/managedprivateendpoints/predicates.go b/resource-manager/datafactory/2018-06-01/managedprivateendpoints/predicates.go
index 773090935c6..ed70a456e2b 100644
--- a/resource-manager/datafactory/2018-06-01/managedprivateendpoints/predicates.go
+++ b/resource-manager/datafactory/2018-06-01/managedprivateendpoints/predicates.go
@@ -12,19 +12,19 @@ type ManagedPrivateEndpointResourceOperationPredicate struct {
 
 func (p ManagedPrivateEndpointResourceOperationPredicate) Matches(input ManagedPrivateEndpointResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datafactory/2018-06-01/managedvirtualnetworks/predicates.go b/resource-manager/datafactory/2018-06-01/managedvirtualnetworks/predicates.go
index f51bb4ba5d3..0dadd70979a 100644
--- a/resource-manager/datafactory/2018-06-01/managedvirtualnetworks/predicates.go
+++ b/resource-manager/datafactory/2018-06-01/managedvirtualnetworks/predicates.go
@@ -12,19 +12,19 @@ type ManagedVirtualNetworkResourceOperationPredicate struct {
 
 func (p ManagedVirtualNetworkResourceOperationPredicate) Matches(input ManagedVirtualNetworkResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datafactory/2018-06-01/pipelines/predicates.go b/resource-manager/datafactory/2018-06-01/pipelines/predicates.go
index d2abb0f8140..8670d6640fa 100644
--- a/resource-manager/datafactory/2018-06-01/pipelines/predicates.go
+++ b/resource-manager/datafactory/2018-06-01/pipelines/predicates.go
@@ -12,19 +12,19 @@ type PipelineResourceOperationPredicate struct {
 
 func (p PipelineResourceOperationPredicate) Matches(input PipelineResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datafactory/2018-06-01/privateendpointconnections/predicates.go b/resource-manager/datafactory/2018-06-01/privateendpointconnections/predicates.go
index 3cd06a2d16e..ea30f9fb133 100644
--- a/resource-manager/datafactory/2018-06-01/privateendpointconnections/predicates.go
+++ b/resource-manager/datafactory/2018-06-01/privateendpointconnections/predicates.go
@@ -12,19 +12,19 @@ type PrivateEndpointConnectionResourceOperationPredicate struct {
 
 func (p PrivateEndpointConnectionResourceOperationPredicate) Matches(input PrivateEndpointConnectionResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datafactory/2018-06-01/triggers/predicates.go b/resource-manager/datafactory/2018-06-01/triggers/predicates.go
index 26d38aa462a..c323a6192c5 100644
--- a/resource-manager/datafactory/2018-06-01/triggers/predicates.go
+++ b/resource-manager/datafactory/2018-06-01/triggers/predicates.go
@@ -12,19 +12,19 @@ type TriggerResourceOperationPredicate struct {
 
 func (p TriggerResourceOperationPredicate) Matches(input TriggerResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datalakeanalytics/2016-11-01/accounts/predicates.go b/resource-manager/datalakeanalytics/2016-11-01/accounts/predicates.go
index 1104eafb261..58adcc788c3 100644
--- a/resource-manager/datalakeanalytics/2016-11-01/accounts/predicates.go
+++ b/resource-manager/datalakeanalytics/2016-11-01/accounts/predicates.go
@@ -12,19 +12,19 @@ type DataLakeAnalyticsAccountBasicOperationPredicate struct {
 
 func (p DataLakeAnalyticsAccountBasicOperationPredicate) Matches(input DataLakeAnalyticsAccountBasic) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datalakeanalytics/2016-11-01/computepolicies/predicates.go b/resource-manager/datalakeanalytics/2016-11-01/computepolicies/predicates.go
index ecd63133fed..542206de845 100644
--- a/resource-manager/datalakeanalytics/2016-11-01/computepolicies/predicates.go
+++ b/resource-manager/datalakeanalytics/2016-11-01/computepolicies/predicates.go
@@ -11,15 +11,15 @@ type ComputePolicyOperationPredicate struct {
 
 func (p ComputePolicyOperationPredicate) Matches(input ComputePolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datalakeanalytics/2016-11-01/datalakestoreaccounts/predicates.go b/resource-manager/datalakeanalytics/2016-11-01/datalakestoreaccounts/predicates.go
index f6af6e71776..bccf784a725 100644
--- a/resource-manager/datalakeanalytics/2016-11-01/datalakestoreaccounts/predicates.go
+++ b/resource-manager/datalakeanalytics/2016-11-01/datalakestoreaccounts/predicates.go
@@ -11,15 +11,15 @@ type DataLakeStoreAccountInformationOperationPredicate struct {
 
 func (p DataLakeStoreAccountInformationOperationPredicate) Matches(input DataLakeStoreAccountInformation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datalakeanalytics/2016-11-01/firewallrules/predicates.go b/resource-manager/datalakeanalytics/2016-11-01/firewallrules/predicates.go
index 1c6d22830c2..fb7011b1d3b 100644
--- a/resource-manager/datalakeanalytics/2016-11-01/firewallrules/predicates.go
+++ b/resource-manager/datalakeanalytics/2016-11-01/firewallrules/predicates.go
@@ -11,15 +11,15 @@ type FirewallRuleOperationPredicate struct {
 
 func (p FirewallRuleOperationPredicate) Matches(input FirewallRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datalakeanalytics/2016-11-01/storageaccounts/predicates.go b/resource-manager/datalakeanalytics/2016-11-01/storageaccounts/predicates.go
index 93c28ba1145..e3d0203ec68 100644
--- a/resource-manager/datalakeanalytics/2016-11-01/storageaccounts/predicates.go
+++ b/resource-manager/datalakeanalytics/2016-11-01/storageaccounts/predicates.go
@@ -9,7 +9,7 @@ type SasTokenInformationOperationPredicate struct {
 
 func (p SasTokenInformationOperationPredicate) Matches(input SasTokenInformation) bool {
 
-	if p.AccessToken != nil && (input.AccessToken == nil && *p.AccessToken != *input.AccessToken) {
+	if p.AccessToken != nil && (input.AccessToken == nil || *p.AccessToken != *input.AccessToken) {
 		return false
 	}
 
@@ -24,15 +24,15 @@ type StorageAccountInformationOperationPredicate struct {
 
 func (p StorageAccountInformationOperationPredicate) Matches(input StorageAccountInformation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -47,15 +47,15 @@ type StorageContainerOperationPredicate struct {
 
 func (p StorageContainerOperationPredicate) Matches(input StorageContainer) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datalakestore/2016-11-01/accounts/predicates.go b/resource-manager/datalakestore/2016-11-01/accounts/predicates.go
index 12b5b534c4a..ac74f4de052 100644
--- a/resource-manager/datalakestore/2016-11-01/accounts/predicates.go
+++ b/resource-manager/datalakestore/2016-11-01/accounts/predicates.go
@@ -12,19 +12,19 @@ type DataLakeStoreAccountBasicOperationPredicate struct {
 
 func (p DataLakeStoreAccountBasicOperationPredicate) Matches(input DataLakeStoreAccountBasic) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datalakestore/2016-11-01/firewallrules/predicates.go b/resource-manager/datalakestore/2016-11-01/firewallrules/predicates.go
index 1c6d22830c2..fb7011b1d3b 100644
--- a/resource-manager/datalakestore/2016-11-01/firewallrules/predicates.go
+++ b/resource-manager/datalakestore/2016-11-01/firewallrules/predicates.go
@@ -11,15 +11,15 @@ type FirewallRuleOperationPredicate struct {
 
 func (p FirewallRuleOperationPredicate) Matches(input FirewallRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datalakestore/2016-11-01/trustedidproviders/predicates.go b/resource-manager/datalakestore/2016-11-01/trustedidproviders/predicates.go
index 755f7135456..42bc533730d 100644
--- a/resource-manager/datalakestore/2016-11-01/trustedidproviders/predicates.go
+++ b/resource-manager/datalakestore/2016-11-01/trustedidproviders/predicates.go
@@ -11,15 +11,15 @@ type TrustedIdProviderOperationPredicate struct {
 
 func (p TrustedIdProviderOperationPredicate) Matches(input TrustedIdProvider) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datalakestore/2016-11-01/virtualnetworkrules/predicates.go b/resource-manager/datalakestore/2016-11-01/virtualnetworkrules/predicates.go
index 3050c3d8f64..9170201b8d5 100644
--- a/resource-manager/datalakestore/2016-11-01/virtualnetworkrules/predicates.go
+++ b/resource-manager/datalakestore/2016-11-01/virtualnetworkrules/predicates.go
@@ -11,15 +11,15 @@ type VirtualNetworkRuleOperationPredicate struct {
 
 func (p VirtualNetworkRuleOperationPredicate) Matches(input VirtualNetworkRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datamigration/2018-04-19/get/predicates.go b/resource-manager/datamigration/2018-04-19/get/predicates.go
index a7f51fb9354..5e4b2d48fd7 100644
--- a/resource-manager/datamigration/2018-04-19/get/predicates.go
+++ b/resource-manager/datamigration/2018-04-19/get/predicates.go
@@ -9,7 +9,7 @@ type AvailableServiceSkuOperationPredicate struct {
 
 func (p AvailableServiceSkuOperationPredicate) Matches(input AvailableServiceSku) bool {
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
@@ -27,15 +27,15 @@ type DataMigrationServiceOperationPredicate struct {
 
 func (p DataMigrationServiceOperationPredicate) Matches(input DataMigrationService) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -43,11 +43,11 @@ func (p DataMigrationServiceOperationPredicate) Matches(input DataMigrationServi
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -63,7 +63,7 @@ type ProjectOperationPredicate struct {
 
 func (p ProjectOperationPredicate) Matches(input Project) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -71,11 +71,11 @@ func (p ProjectOperationPredicate) Matches(input Project) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -91,19 +91,19 @@ type ProjectTaskOperationPredicate struct {
 
 func (p ProjectTaskOperationPredicate) Matches(input ProjectTask) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -119,19 +119,19 @@ type QuotaOperationPredicate struct {
 
 func (p QuotaOperationPredicate) Matches(input Quota) bool {
 
-	if p.CurrentValue != nil && (input.CurrentValue == nil && *p.CurrentValue != *input.CurrentValue) {
+	if p.CurrentValue != nil && (input.CurrentValue == nil || *p.CurrentValue != *input.CurrentValue) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
-	if p.Unit != nil && (input.Unit == nil && *p.Unit != *input.Unit) {
+	if p.Unit != nil && (input.Unit == nil || *p.Unit != *input.Unit) {
 		return false
 	}
 
@@ -149,27 +149,27 @@ type ResourceSkuOperationPredicate struct {
 
 func (p ResourceSkuOperationPredicate) Matches(input ResourceSku) bool {
 
-	if p.Family != nil && (input.Family == nil && *p.Family != *input.Family) {
+	if p.Family != nil && (input.Family == nil || *p.Family != *input.Family) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
-	if p.Size != nil && (input.Size == nil && *p.Size != *input.Size) {
+	if p.Size != nil && (input.Size == nil || *p.Size != *input.Size) {
 		return false
 	}
 
-	if p.Tier != nil && (input.Tier == nil && *p.Tier != *input.Tier) {
+	if p.Tier != nil && (input.Tier == nil || *p.Tier != *input.Tier) {
 		return false
 	}
 
diff --git a/resource-manager/datamigration/2018-04-19/projectresource/predicates.go b/resource-manager/datamigration/2018-04-19/projectresource/predicates.go
index 3813bb344e7..beaad2eb053 100644
--- a/resource-manager/datamigration/2018-04-19/projectresource/predicates.go
+++ b/resource-manager/datamigration/2018-04-19/projectresource/predicates.go
@@ -12,7 +12,7 @@ type ProjectOperationPredicate struct {
 
 func (p ProjectOperationPredicate) Matches(input Project) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ProjectOperationPredicate) Matches(input Project) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datamigration/2018-04-19/serviceresource/predicates.go b/resource-manager/datamigration/2018-04-19/serviceresource/predicates.go
index aa8dc95853e..e7e7f4218cf 100644
--- a/resource-manager/datamigration/2018-04-19/serviceresource/predicates.go
+++ b/resource-manager/datamigration/2018-04-19/serviceresource/predicates.go
@@ -9,7 +9,7 @@ type AvailableServiceSkuOperationPredicate struct {
 
 func (p AvailableServiceSkuOperationPredicate) Matches(input AvailableServiceSku) bool {
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
@@ -27,15 +27,15 @@ type DataMigrationServiceOperationPredicate struct {
 
 func (p DataMigrationServiceOperationPredicate) Matches(input DataMigrationService) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -43,11 +43,11 @@ func (p DataMigrationServiceOperationPredicate) Matches(input DataMigrationServi
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -63,19 +63,19 @@ type ProjectTaskOperationPredicate struct {
 
 func (p ProjectTaskOperationPredicate) Matches(input ProjectTask) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datamigration/2018-04-19/standardoperation/predicates.go b/resource-manager/datamigration/2018-04-19/standardoperation/predicates.go
index 30b6ad8ddc2..7f76688fe13 100644
--- a/resource-manager/datamigration/2018-04-19/standardoperation/predicates.go
+++ b/resource-manager/datamigration/2018-04-19/standardoperation/predicates.go
@@ -9,7 +9,7 @@ type AvailableServiceSkuOperationPredicate struct {
 
 func (p AvailableServiceSkuOperationPredicate) Matches(input AvailableServiceSku) bool {
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
@@ -27,15 +27,15 @@ type DataMigrationServiceOperationPredicate struct {
 
 func (p DataMigrationServiceOperationPredicate) Matches(input DataMigrationService) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -43,11 +43,11 @@ func (p DataMigrationServiceOperationPredicate) Matches(input DataMigrationServi
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -63,7 +63,7 @@ type ProjectOperationPredicate struct {
 
 func (p ProjectOperationPredicate) Matches(input Project) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -71,11 +71,11 @@ func (p ProjectOperationPredicate) Matches(input Project) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -91,19 +91,19 @@ type ProjectTaskOperationPredicate struct {
 
 func (p ProjectTaskOperationPredicate) Matches(input ProjectTask) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -119,19 +119,19 @@ type QuotaOperationPredicate struct {
 
 func (p QuotaOperationPredicate) Matches(input Quota) bool {
 
-	if p.CurrentValue != nil && (input.CurrentValue == nil && *p.CurrentValue != *input.CurrentValue) {
+	if p.CurrentValue != nil && (input.CurrentValue == nil || *p.CurrentValue != *input.CurrentValue) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
-	if p.Unit != nil && (input.Unit == nil && *p.Unit != *input.Unit) {
+	if p.Unit != nil && (input.Unit == nil || *p.Unit != *input.Unit) {
 		return false
 	}
 
@@ -149,27 +149,27 @@ type ResourceSkuOperationPredicate struct {
 
 func (p ResourceSkuOperationPredicate) Matches(input ResourceSku) bool {
 
-	if p.Family != nil && (input.Family == nil && *p.Family != *input.Family) {
+	if p.Family != nil && (input.Family == nil || *p.Family != *input.Family) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
-	if p.Size != nil && (input.Size == nil && *p.Size != *input.Size) {
+	if p.Size != nil && (input.Size == nil || *p.Size != *input.Size) {
 		return false
 	}
 
-	if p.Tier != nil && (input.Tier == nil && *p.Tier != *input.Tier) {
+	if p.Tier != nil && (input.Tier == nil || *p.Tier != *input.Tier) {
 		return false
 	}
 
diff --git a/resource-manager/datamigration/2021-06-30/fileresource/predicates.go b/resource-manager/datamigration/2021-06-30/fileresource/predicates.go
index fdc03be641c..20b2ad94d58 100644
--- a/resource-manager/datamigration/2021-06-30/fileresource/predicates.go
+++ b/resource-manager/datamigration/2021-06-30/fileresource/predicates.go
@@ -12,19 +12,19 @@ type ProjectFileOperationPredicate struct {
 
 func (p ProjectFileOperationPredicate) Matches(input ProjectFile) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datamigration/2021-06-30/get/predicates.go b/resource-manager/datamigration/2021-06-30/get/predicates.go
index e8286b8cc5f..1a48f998d0a 100644
--- a/resource-manager/datamigration/2021-06-30/get/predicates.go
+++ b/resource-manager/datamigration/2021-06-30/get/predicates.go
@@ -9,7 +9,7 @@ type AvailableServiceSkuOperationPredicate struct {
 
 func (p AvailableServiceSkuOperationPredicate) Matches(input AvailableServiceSku) bool {
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
@@ -27,15 +27,15 @@ type DataMigrationServiceOperationPredicate struct {
 
 func (p DataMigrationServiceOperationPredicate) Matches(input DataMigrationService) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -43,11 +43,11 @@ func (p DataMigrationServiceOperationPredicate) Matches(input DataMigrationServi
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -63,7 +63,7 @@ type ProjectOperationPredicate struct {
 
 func (p ProjectOperationPredicate) Matches(input Project) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -71,11 +71,11 @@ func (p ProjectOperationPredicate) Matches(input Project) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -91,19 +91,19 @@ type ProjectFileOperationPredicate struct {
 
 func (p ProjectFileOperationPredicate) Matches(input ProjectFile) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -119,19 +119,19 @@ type ProjectTaskOperationPredicate struct {
 
 func (p ProjectTaskOperationPredicate) Matches(input ProjectTask) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -147,19 +147,19 @@ type QuotaOperationPredicate struct {
 
 func (p QuotaOperationPredicate) Matches(input Quota) bool {
 
-	if p.CurrentValue != nil && (input.CurrentValue == nil && *p.CurrentValue != *input.CurrentValue) {
+	if p.CurrentValue != nil && (input.CurrentValue == nil || *p.CurrentValue != *input.CurrentValue) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
-	if p.Unit != nil && (input.Unit == nil && *p.Unit != *input.Unit) {
+	if p.Unit != nil && (input.Unit == nil || *p.Unit != *input.Unit) {
 		return false
 	}
 
@@ -177,27 +177,27 @@ type ResourceSkuOperationPredicate struct {
 
 func (p ResourceSkuOperationPredicate) Matches(input ResourceSku) bool {
 
-	if p.Family != nil && (input.Family == nil && *p.Family != *input.Family) {
+	if p.Family != nil && (input.Family == nil || *p.Family != *input.Family) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
-	if p.Size != nil && (input.Size == nil && *p.Size != *input.Size) {
+	if p.Size != nil && (input.Size == nil || *p.Size != *input.Size) {
 		return false
 	}
 
-	if p.Tier != nil && (input.Tier == nil && *p.Tier != *input.Tier) {
+	if p.Tier != nil && (input.Tier == nil || *p.Tier != *input.Tier) {
 		return false
 	}
 
diff --git a/resource-manager/datamigration/2021-06-30/projectresource/predicates.go b/resource-manager/datamigration/2021-06-30/projectresource/predicates.go
index 3813bb344e7..beaad2eb053 100644
--- a/resource-manager/datamigration/2021-06-30/projectresource/predicates.go
+++ b/resource-manager/datamigration/2021-06-30/projectresource/predicates.go
@@ -12,7 +12,7 @@ type ProjectOperationPredicate struct {
 
 func (p ProjectOperationPredicate) Matches(input Project) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ProjectOperationPredicate) Matches(input Project) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datamigration/2021-06-30/serviceresource/predicates.go b/resource-manager/datamigration/2021-06-30/serviceresource/predicates.go
index aa8dc95853e..e7e7f4218cf 100644
--- a/resource-manager/datamigration/2021-06-30/serviceresource/predicates.go
+++ b/resource-manager/datamigration/2021-06-30/serviceresource/predicates.go
@@ -9,7 +9,7 @@ type AvailableServiceSkuOperationPredicate struct {
 
 func (p AvailableServiceSkuOperationPredicate) Matches(input AvailableServiceSku) bool {
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
@@ -27,15 +27,15 @@ type DataMigrationServiceOperationPredicate struct {
 
 func (p DataMigrationServiceOperationPredicate) Matches(input DataMigrationService) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -43,11 +43,11 @@ func (p DataMigrationServiceOperationPredicate) Matches(input DataMigrationServi
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -63,19 +63,19 @@ type ProjectTaskOperationPredicate struct {
 
 func (p ProjectTaskOperationPredicate) Matches(input ProjectTask) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datamigration/2021-06-30/standardoperation/predicates.go b/resource-manager/datamigration/2021-06-30/standardoperation/predicates.go
index 69f020186e3..65e0fe43622 100644
--- a/resource-manager/datamigration/2021-06-30/standardoperation/predicates.go
+++ b/resource-manager/datamigration/2021-06-30/standardoperation/predicates.go
@@ -9,7 +9,7 @@ type AvailableServiceSkuOperationPredicate struct {
 
 func (p AvailableServiceSkuOperationPredicate) Matches(input AvailableServiceSku) bool {
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
@@ -27,15 +27,15 @@ type DataMigrationServiceOperationPredicate struct {
 
 func (p DataMigrationServiceOperationPredicate) Matches(input DataMigrationService) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -43,11 +43,11 @@ func (p DataMigrationServiceOperationPredicate) Matches(input DataMigrationServi
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -63,7 +63,7 @@ type ProjectOperationPredicate struct {
 
 func (p ProjectOperationPredicate) Matches(input Project) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -71,11 +71,11 @@ func (p ProjectOperationPredicate) Matches(input Project) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -91,19 +91,19 @@ type ProjectFileOperationPredicate struct {
 
 func (p ProjectFileOperationPredicate) Matches(input ProjectFile) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -119,19 +119,19 @@ type ProjectTaskOperationPredicate struct {
 
 func (p ProjectTaskOperationPredicate) Matches(input ProjectTask) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -147,19 +147,19 @@ type QuotaOperationPredicate struct {
 
 func (p QuotaOperationPredicate) Matches(input Quota) bool {
 
-	if p.CurrentValue != nil && (input.CurrentValue == nil && *p.CurrentValue != *input.CurrentValue) {
+	if p.CurrentValue != nil && (input.CurrentValue == nil || *p.CurrentValue != *input.CurrentValue) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
-	if p.Unit != nil && (input.Unit == nil && *p.Unit != *input.Unit) {
+	if p.Unit != nil && (input.Unit == nil || *p.Unit != *input.Unit) {
 		return false
 	}
 
@@ -177,27 +177,27 @@ type ResourceSkuOperationPredicate struct {
 
 func (p ResourceSkuOperationPredicate) Matches(input ResourceSku) bool {
 
-	if p.Family != nil && (input.Family == nil && *p.Family != *input.Family) {
+	if p.Family != nil && (input.Family == nil || *p.Family != *input.Family) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
-	if p.Size != nil && (input.Size == nil && *p.Size != *input.Size) {
+	if p.Size != nil && (input.Size == nil || *p.Size != *input.Size) {
 		return false
 	}
 
-	if p.Tier != nil && (input.Tier == nil && *p.Tier != *input.Tier) {
+	if p.Tier != nil && (input.Tier == nil || *p.Tier != *input.Tier) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2022-04-01/azurebackupjobs/predicates.go b/resource-manager/dataprotection/2022-04-01/azurebackupjobs/predicates.go
index 42471168d65..5f79648ba7d 100644
--- a/resource-manager/dataprotection/2022-04-01/azurebackupjobs/predicates.go
+++ b/resource-manager/dataprotection/2022-04-01/azurebackupjobs/predicates.go
@@ -11,15 +11,15 @@ type AzureBackupJobResourceOperationPredicate struct {
 
 func (p AzureBackupJobResourceOperationPredicate) Matches(input AzureBackupJobResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2022-04-01/backupinstances/predicates.go b/resource-manager/dataprotection/2022-04-01/backupinstances/predicates.go
index 27949491b15..c734a2fe8ca 100644
--- a/resource-manager/dataprotection/2022-04-01/backupinstances/predicates.go
+++ b/resource-manager/dataprotection/2022-04-01/backupinstances/predicates.go
@@ -11,15 +11,15 @@ type BackupInstanceResourceOperationPredicate struct {
 
 func (p BackupInstanceResourceOperationPredicate) Matches(input BackupInstanceResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2022-04-01/backuppolicies/predicates.go b/resource-manager/dataprotection/2022-04-01/backuppolicies/predicates.go
index 6855f43522b..e53bb0c1ed4 100644
--- a/resource-manager/dataprotection/2022-04-01/backuppolicies/predicates.go
+++ b/resource-manager/dataprotection/2022-04-01/backuppolicies/predicates.go
@@ -11,15 +11,15 @@ type BaseBackupPolicyResourceOperationPredicate struct {
 
 func (p BaseBackupPolicyResourceOperationPredicate) Matches(input BaseBackupPolicyResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2022-04-01/backupvaults/predicates.go b/resource-manager/dataprotection/2022-04-01/backupvaults/predicates.go
index eefb18b48c0..241a550b4d5 100644
--- a/resource-manager/dataprotection/2022-04-01/backupvaults/predicates.go
+++ b/resource-manager/dataprotection/2022-04-01/backupvaults/predicates.go
@@ -13,11 +13,11 @@ type BackupVaultResourceOperationPredicate struct {
 
 func (p BackupVaultResourceOperationPredicate) Matches(input BackupVaultResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p BackupVaultResourceOperationPredicate) Matches(input BackupVaultResource
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2022-04-01/recoverypoint/predicates.go b/resource-manager/dataprotection/2022-04-01/recoverypoint/predicates.go
index db8bbd491c8..4c929e3a8cc 100644
--- a/resource-manager/dataprotection/2022-04-01/recoverypoint/predicates.go
+++ b/resource-manager/dataprotection/2022-04-01/recoverypoint/predicates.go
@@ -11,15 +11,15 @@ type AzureBackupRecoveryPointResourceOperationPredicate struct {
 
 func (p AzureBackupRecoveryPointResourceOperationPredicate) Matches(input AzureBackupRecoveryPointResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2022-04-01/resourceguards/predicates.go b/resource-manager/dataprotection/2022-04-01/resourceguards/predicates.go
index 92310da15be..839d8fbca1b 100644
--- a/resource-manager/dataprotection/2022-04-01/resourceguards/predicates.go
+++ b/resource-manager/dataprotection/2022-04-01/resourceguards/predicates.go
@@ -11,15 +11,15 @@ type DppBaseResourceOperationPredicate struct {
 
 func (p DppBaseResourceOperationPredicate) Matches(input DppBaseResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -36,23 +36,23 @@ type ResourceGuardResourceOperationPredicate struct {
 
 func (p ResourceGuardResourceOperationPredicate) Matches(input ResourceGuardResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2022-05-01/azurebackupjobs/predicates.go b/resource-manager/dataprotection/2022-05-01/azurebackupjobs/predicates.go
index 42471168d65..5f79648ba7d 100644
--- a/resource-manager/dataprotection/2022-05-01/azurebackupjobs/predicates.go
+++ b/resource-manager/dataprotection/2022-05-01/azurebackupjobs/predicates.go
@@ -11,15 +11,15 @@ type AzureBackupJobResourceOperationPredicate struct {
 
 func (p AzureBackupJobResourceOperationPredicate) Matches(input AzureBackupJobResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2022-05-01/backupinstances/predicates.go b/resource-manager/dataprotection/2022-05-01/backupinstances/predicates.go
index 27949491b15..c734a2fe8ca 100644
--- a/resource-manager/dataprotection/2022-05-01/backupinstances/predicates.go
+++ b/resource-manager/dataprotection/2022-05-01/backupinstances/predicates.go
@@ -11,15 +11,15 @@ type BackupInstanceResourceOperationPredicate struct {
 
 func (p BackupInstanceResourceOperationPredicate) Matches(input BackupInstanceResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2022-05-01/backuppolicies/predicates.go b/resource-manager/dataprotection/2022-05-01/backuppolicies/predicates.go
index 6855f43522b..e53bb0c1ed4 100644
--- a/resource-manager/dataprotection/2022-05-01/backuppolicies/predicates.go
+++ b/resource-manager/dataprotection/2022-05-01/backuppolicies/predicates.go
@@ -11,15 +11,15 @@ type BaseBackupPolicyResourceOperationPredicate struct {
 
 func (p BaseBackupPolicyResourceOperationPredicate) Matches(input BaseBackupPolicyResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2022-05-01/backupvaults/predicates.go b/resource-manager/dataprotection/2022-05-01/backupvaults/predicates.go
index eefb18b48c0..241a550b4d5 100644
--- a/resource-manager/dataprotection/2022-05-01/backupvaults/predicates.go
+++ b/resource-manager/dataprotection/2022-05-01/backupvaults/predicates.go
@@ -13,11 +13,11 @@ type BackupVaultResourceOperationPredicate struct {
 
 func (p BackupVaultResourceOperationPredicate) Matches(input BackupVaultResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p BackupVaultResourceOperationPredicate) Matches(input BackupVaultResource
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2022-05-01/recoverypoint/predicates.go b/resource-manager/dataprotection/2022-05-01/recoverypoint/predicates.go
index db8bbd491c8..4c929e3a8cc 100644
--- a/resource-manager/dataprotection/2022-05-01/recoverypoint/predicates.go
+++ b/resource-manager/dataprotection/2022-05-01/recoverypoint/predicates.go
@@ -11,15 +11,15 @@ type AzureBackupRecoveryPointResourceOperationPredicate struct {
 
 func (p AzureBackupRecoveryPointResourceOperationPredicate) Matches(input AzureBackupRecoveryPointResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2022-05-01/resourceguards/predicates.go b/resource-manager/dataprotection/2022-05-01/resourceguards/predicates.go
index 92310da15be..839d8fbca1b 100644
--- a/resource-manager/dataprotection/2022-05-01/resourceguards/predicates.go
+++ b/resource-manager/dataprotection/2022-05-01/resourceguards/predicates.go
@@ -11,15 +11,15 @@ type DppBaseResourceOperationPredicate struct {
 
 func (p DppBaseResourceOperationPredicate) Matches(input DppBaseResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -36,23 +36,23 @@ type ResourceGuardResourceOperationPredicate struct {
 
 func (p ResourceGuardResourceOperationPredicate) Matches(input ResourceGuardResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2022-12-01/azurebackupjobs/predicates.go b/resource-manager/dataprotection/2022-12-01/azurebackupjobs/predicates.go
index 42471168d65..5f79648ba7d 100644
--- a/resource-manager/dataprotection/2022-12-01/azurebackupjobs/predicates.go
+++ b/resource-manager/dataprotection/2022-12-01/azurebackupjobs/predicates.go
@@ -11,15 +11,15 @@ type AzureBackupJobResourceOperationPredicate struct {
 
 func (p AzureBackupJobResourceOperationPredicate) Matches(input AzureBackupJobResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2022-12-01/backupinstances/predicates.go b/resource-manager/dataprotection/2022-12-01/backupinstances/predicates.go
index 27949491b15..c734a2fe8ca 100644
--- a/resource-manager/dataprotection/2022-12-01/backupinstances/predicates.go
+++ b/resource-manager/dataprotection/2022-12-01/backupinstances/predicates.go
@@ -11,15 +11,15 @@ type BackupInstanceResourceOperationPredicate struct {
 
 func (p BackupInstanceResourceOperationPredicate) Matches(input BackupInstanceResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2022-12-01/backuppolicies/predicates.go b/resource-manager/dataprotection/2022-12-01/backuppolicies/predicates.go
index 6855f43522b..e53bb0c1ed4 100644
--- a/resource-manager/dataprotection/2022-12-01/backuppolicies/predicates.go
+++ b/resource-manager/dataprotection/2022-12-01/backuppolicies/predicates.go
@@ -11,15 +11,15 @@ type BaseBackupPolicyResourceOperationPredicate struct {
 
 func (p BaseBackupPolicyResourceOperationPredicate) Matches(input BaseBackupPolicyResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2022-12-01/backupvaults/predicates.go b/resource-manager/dataprotection/2022-12-01/backupvaults/predicates.go
index eefb18b48c0..241a550b4d5 100644
--- a/resource-manager/dataprotection/2022-12-01/backupvaults/predicates.go
+++ b/resource-manager/dataprotection/2022-12-01/backupvaults/predicates.go
@@ -13,11 +13,11 @@ type BackupVaultResourceOperationPredicate struct {
 
 func (p BackupVaultResourceOperationPredicate) Matches(input BackupVaultResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p BackupVaultResourceOperationPredicate) Matches(input BackupVaultResource
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2022-12-01/deletedbackupinstances/predicates.go b/resource-manager/dataprotection/2022-12-01/deletedbackupinstances/predicates.go
index 89dd12e17cd..d7c6585786d 100644
--- a/resource-manager/dataprotection/2022-12-01/deletedbackupinstances/predicates.go
+++ b/resource-manager/dataprotection/2022-12-01/deletedbackupinstances/predicates.go
@@ -11,15 +11,15 @@ type DeletedBackupInstanceResourceOperationPredicate struct {
 
 func (p DeletedBackupInstanceResourceOperationPredicate) Matches(input DeletedBackupInstanceResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2022-12-01/recoverypoint/predicates.go b/resource-manager/dataprotection/2022-12-01/recoverypoint/predicates.go
index db8bbd491c8..4c929e3a8cc 100644
--- a/resource-manager/dataprotection/2022-12-01/recoverypoint/predicates.go
+++ b/resource-manager/dataprotection/2022-12-01/recoverypoint/predicates.go
@@ -11,15 +11,15 @@ type AzureBackupRecoveryPointResourceOperationPredicate struct {
 
 func (p AzureBackupRecoveryPointResourceOperationPredicate) Matches(input AzureBackupRecoveryPointResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2022-12-01/resourceguards/predicates.go b/resource-manager/dataprotection/2022-12-01/resourceguards/predicates.go
index 92310da15be..839d8fbca1b 100644
--- a/resource-manager/dataprotection/2022-12-01/resourceguards/predicates.go
+++ b/resource-manager/dataprotection/2022-12-01/resourceguards/predicates.go
@@ -11,15 +11,15 @@ type DppBaseResourceOperationPredicate struct {
 
 func (p DppBaseResourceOperationPredicate) Matches(input DppBaseResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -36,23 +36,23 @@ type ResourceGuardResourceOperationPredicate struct {
 
 func (p ResourceGuardResourceOperationPredicate) Matches(input ResourceGuardResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2023-01-01/azurebackupjobs/predicates.go b/resource-manager/dataprotection/2023-01-01/azurebackupjobs/predicates.go
index 42471168d65..5f79648ba7d 100644
--- a/resource-manager/dataprotection/2023-01-01/azurebackupjobs/predicates.go
+++ b/resource-manager/dataprotection/2023-01-01/azurebackupjobs/predicates.go
@@ -11,15 +11,15 @@ type AzureBackupJobResourceOperationPredicate struct {
 
 func (p AzureBackupJobResourceOperationPredicate) Matches(input AzureBackupJobResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2023-01-01/backupinstances/predicates.go b/resource-manager/dataprotection/2023-01-01/backupinstances/predicates.go
index 27949491b15..c734a2fe8ca 100644
--- a/resource-manager/dataprotection/2023-01-01/backupinstances/predicates.go
+++ b/resource-manager/dataprotection/2023-01-01/backupinstances/predicates.go
@@ -11,15 +11,15 @@ type BackupInstanceResourceOperationPredicate struct {
 
 func (p BackupInstanceResourceOperationPredicate) Matches(input BackupInstanceResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2023-01-01/backuppolicies/predicates.go b/resource-manager/dataprotection/2023-01-01/backuppolicies/predicates.go
index 6855f43522b..e53bb0c1ed4 100644
--- a/resource-manager/dataprotection/2023-01-01/backuppolicies/predicates.go
+++ b/resource-manager/dataprotection/2023-01-01/backuppolicies/predicates.go
@@ -11,15 +11,15 @@ type BaseBackupPolicyResourceOperationPredicate struct {
 
 func (p BaseBackupPolicyResourceOperationPredicate) Matches(input BaseBackupPolicyResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2023-01-01/backupvaults/predicates.go b/resource-manager/dataprotection/2023-01-01/backupvaults/predicates.go
index eefb18b48c0..241a550b4d5 100644
--- a/resource-manager/dataprotection/2023-01-01/backupvaults/predicates.go
+++ b/resource-manager/dataprotection/2023-01-01/backupvaults/predicates.go
@@ -13,11 +13,11 @@ type BackupVaultResourceOperationPredicate struct {
 
 func (p BackupVaultResourceOperationPredicate) Matches(input BackupVaultResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p BackupVaultResourceOperationPredicate) Matches(input BackupVaultResource
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2023-01-01/deletedbackupinstances/predicates.go b/resource-manager/dataprotection/2023-01-01/deletedbackupinstances/predicates.go
index 89dd12e17cd..d7c6585786d 100644
--- a/resource-manager/dataprotection/2023-01-01/deletedbackupinstances/predicates.go
+++ b/resource-manager/dataprotection/2023-01-01/deletedbackupinstances/predicates.go
@@ -11,15 +11,15 @@ type DeletedBackupInstanceResourceOperationPredicate struct {
 
 func (p DeletedBackupInstanceResourceOperationPredicate) Matches(input DeletedBackupInstanceResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2023-01-01/dppresourceguardproxies/predicates.go b/resource-manager/dataprotection/2023-01-01/dppresourceguardproxies/predicates.go
index 1a35f041166..6da3b96156e 100644
--- a/resource-manager/dataprotection/2023-01-01/dppresourceguardproxies/predicates.go
+++ b/resource-manager/dataprotection/2023-01-01/dppresourceguardproxies/predicates.go
@@ -11,15 +11,15 @@ type ResourceGuardProxyBaseResourceOperationPredicate struct {
 
 func (p ResourceGuardProxyBaseResourceOperationPredicate) Matches(input ResourceGuardProxyBaseResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2023-01-01/recoverypoint/predicates.go b/resource-manager/dataprotection/2023-01-01/recoverypoint/predicates.go
index db8bbd491c8..4c929e3a8cc 100644
--- a/resource-manager/dataprotection/2023-01-01/recoverypoint/predicates.go
+++ b/resource-manager/dataprotection/2023-01-01/recoverypoint/predicates.go
@@ -11,15 +11,15 @@ type AzureBackupRecoveryPointResourceOperationPredicate struct {
 
 func (p AzureBackupRecoveryPointResourceOperationPredicate) Matches(input AzureBackupRecoveryPointResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dataprotection/2023-01-01/resourceguards/predicates.go b/resource-manager/dataprotection/2023-01-01/resourceguards/predicates.go
index 92310da15be..839d8fbca1b 100644
--- a/resource-manager/dataprotection/2023-01-01/resourceguards/predicates.go
+++ b/resource-manager/dataprotection/2023-01-01/resourceguards/predicates.go
@@ -11,15 +11,15 @@ type DppBaseResourceOperationPredicate struct {
 
 func (p DppBaseResourceOperationPredicate) Matches(input DppBaseResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -36,23 +36,23 @@ type ResourceGuardResourceOperationPredicate struct {
 
 func (p ResourceGuardResourceOperationPredicate) Matches(input ResourceGuardResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datashare/2019-11-01/account/predicates.go b/resource-manager/datashare/2019-11-01/account/predicates.go
index 3796cfad2e4..c71ce792507 100644
--- a/resource-manager/datashare/2019-11-01/account/predicates.go
+++ b/resource-manager/datashare/2019-11-01/account/predicates.go
@@ -12,19 +12,19 @@ type AccountOperationPredicate struct {
 
 func (p AccountOperationPredicate) Matches(input Account) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datashare/2019-11-01/consumerinvitation/predicates.go b/resource-manager/datashare/2019-11-01/consumerinvitation/predicates.go
index a8fbfa8a0d8..4a1c3c46814 100644
--- a/resource-manager/datashare/2019-11-01/consumerinvitation/predicates.go
+++ b/resource-manager/datashare/2019-11-01/consumerinvitation/predicates.go
@@ -11,15 +11,15 @@ type ConsumerInvitationOperationPredicate struct {
 
 func (p ConsumerInvitationOperationPredicate) Matches(input ConsumerInvitation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datashare/2019-11-01/invitation/predicates.go b/resource-manager/datashare/2019-11-01/invitation/predicates.go
index d414b82949e..d3905240ad4 100644
--- a/resource-manager/datashare/2019-11-01/invitation/predicates.go
+++ b/resource-manager/datashare/2019-11-01/invitation/predicates.go
@@ -11,15 +11,15 @@ type InvitationOperationPredicate struct {
 
 func (p InvitationOperationPredicate) Matches(input Invitation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datashare/2019-11-01/share/predicates.go b/resource-manager/datashare/2019-11-01/share/predicates.go
index 9c67cb84c9c..b2176d6514f 100644
--- a/resource-manager/datashare/2019-11-01/share/predicates.go
+++ b/resource-manager/datashare/2019-11-01/share/predicates.go
@@ -11,15 +11,15 @@ type ProviderShareSubscriptionOperationPredicate struct {
 
 func (p ProviderShareSubscriptionOperationPredicate) Matches(input ProviderShareSubscription) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type ShareOperationPredicate struct {
 
 func (p ShareOperationPredicate) Matches(input Share) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -63,39 +63,39 @@ type ShareSynchronizationOperationPredicate struct {
 
 func (p ShareSynchronizationOperationPredicate) Matches(input ShareSynchronization) bool {
 
-	if p.ConsumerEmail != nil && (input.ConsumerEmail == nil && *p.ConsumerEmail != *input.ConsumerEmail) {
+	if p.ConsumerEmail != nil && (input.ConsumerEmail == nil || *p.ConsumerEmail != *input.ConsumerEmail) {
 		return false
 	}
 
-	if p.ConsumerName != nil && (input.ConsumerName == nil && *p.ConsumerName != *input.ConsumerName) {
+	if p.ConsumerName != nil && (input.ConsumerName == nil || *p.ConsumerName != *input.ConsumerName) {
 		return false
 	}
 
-	if p.ConsumerTenantName != nil && (input.ConsumerTenantName == nil && *p.ConsumerTenantName != *input.ConsumerTenantName) {
+	if p.ConsumerTenantName != nil && (input.ConsumerTenantName == nil || *p.ConsumerTenantName != *input.ConsumerTenantName) {
 		return false
 	}
 
-	if p.DurationMs != nil && (input.DurationMs == nil && *p.DurationMs != *input.DurationMs) {
+	if p.DurationMs != nil && (input.DurationMs == nil || *p.DurationMs != *input.DurationMs) {
 		return false
 	}
 
-	if p.EndTime != nil && (input.EndTime == nil && *p.EndTime != *input.EndTime) {
+	if p.EndTime != nil && (input.EndTime == nil || *p.EndTime != *input.EndTime) {
 		return false
 	}
 
-	if p.Message != nil && (input.Message == nil && *p.Message != *input.Message) {
+	if p.Message != nil && (input.Message == nil || *p.Message != *input.Message) {
 		return false
 	}
 
-	if p.StartTime != nil && (input.StartTime == nil && *p.StartTime != *input.StartTime) {
+	if p.StartTime != nil && (input.StartTime == nil || *p.StartTime != *input.StartTime) {
 		return false
 	}
 
-	if p.Status != nil && (input.Status == nil && *p.Status != *input.Status) {
+	if p.Status != nil && (input.Status == nil || *p.Status != *input.Status) {
 		return false
 	}
 
-	if p.SynchronizationId != nil && (input.SynchronizationId == nil && *p.SynchronizationId != *input.SynchronizationId) {
+	if p.SynchronizationId != nil && (input.SynchronizationId == nil || *p.SynchronizationId != *input.SynchronizationId) {
 		return false
 	}
 
@@ -121,59 +121,59 @@ type SynchronizationDetailsOperationPredicate struct {
 
 func (p SynchronizationDetailsOperationPredicate) Matches(input SynchronizationDetails) bool {
 
-	if p.DataSetId != nil && (input.DataSetId == nil && *p.DataSetId != *input.DataSetId) {
+	if p.DataSetId != nil && (input.DataSetId == nil || *p.DataSetId != *input.DataSetId) {
 		return false
 	}
 
-	if p.DurationMs != nil && (input.DurationMs == nil && *p.DurationMs != *input.DurationMs) {
+	if p.DurationMs != nil && (input.DurationMs == nil || *p.DurationMs != *input.DurationMs) {
 		return false
 	}
 
-	if p.EndTime != nil && (input.EndTime == nil && *p.EndTime != *input.EndTime) {
+	if p.EndTime != nil && (input.EndTime == nil || *p.EndTime != *input.EndTime) {
 		return false
 	}
 
-	if p.FilesRead != nil && (input.FilesRead == nil && *p.FilesRead != *input.FilesRead) {
+	if p.FilesRead != nil && (input.FilesRead == nil || *p.FilesRead != *input.FilesRead) {
 		return false
 	}
 
-	if p.FilesWritten != nil && (input.FilesWritten == nil && *p.FilesWritten != *input.FilesWritten) {
+	if p.FilesWritten != nil && (input.FilesWritten == nil || *p.FilesWritten != *input.FilesWritten) {
 		return false
 	}
 
-	if p.Message != nil && (input.Message == nil && *p.Message != *input.Message) {
+	if p.Message != nil && (input.Message == nil || *p.Message != *input.Message) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.RowsCopied != nil && (input.RowsCopied == nil && *p.RowsCopied != *input.RowsCopied) {
+	if p.RowsCopied != nil && (input.RowsCopied == nil || *p.RowsCopied != *input.RowsCopied) {
 		return false
 	}
 
-	if p.RowsRead != nil && (input.RowsRead == nil && *p.RowsRead != *input.RowsRead) {
+	if p.RowsRead != nil && (input.RowsRead == nil || *p.RowsRead != *input.RowsRead) {
 		return false
 	}
 
-	if p.SizeRead != nil && (input.SizeRead == nil && *p.SizeRead != *input.SizeRead) {
+	if p.SizeRead != nil && (input.SizeRead == nil || *p.SizeRead != *input.SizeRead) {
 		return false
 	}
 
-	if p.SizeWritten != nil && (input.SizeWritten == nil && *p.SizeWritten != *input.SizeWritten) {
+	if p.SizeWritten != nil && (input.SizeWritten == nil || *p.SizeWritten != *input.SizeWritten) {
 		return false
 	}
 
-	if p.StartTime != nil && (input.StartTime == nil && *p.StartTime != *input.StartTime) {
+	if p.StartTime != nil && (input.StartTime == nil || *p.StartTime != *input.StartTime) {
 		return false
 	}
 
-	if p.Status != nil && (input.Status == nil && *p.Status != *input.Status) {
+	if p.Status != nil && (input.Status == nil || *p.Status != *input.Status) {
 		return false
 	}
 
-	if p.VCore != nil && (input.VCore == nil && *p.VCore != *input.VCore) {
+	if p.VCore != nil && (input.VCore == nil || *p.VCore != *input.VCore) {
 		return false
 	}
 
diff --git a/resource-manager/datashare/2019-11-01/sharesubscription/predicates.go b/resource-manager/datashare/2019-11-01/sharesubscription/predicates.go
index 8a50bf48540..403a5d60ca5 100644
--- a/resource-manager/datashare/2019-11-01/sharesubscription/predicates.go
+++ b/resource-manager/datashare/2019-11-01/sharesubscription/predicates.go
@@ -11,15 +11,15 @@ type ConsumerSourceDataSetOperationPredicate struct {
 
 func (p ConsumerSourceDataSetOperationPredicate) Matches(input ConsumerSourceDataSet) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type ShareSubscriptionOperationPredicate struct {
 
 func (p ShareSubscriptionOperationPredicate) Matches(input ShareSubscription) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -60,23 +60,23 @@ type ShareSubscriptionSynchronizationOperationPredicate struct {
 
 func (p ShareSubscriptionSynchronizationOperationPredicate) Matches(input ShareSubscriptionSynchronization) bool {
 
-	if p.DurationMs != nil && (input.DurationMs == nil && *p.DurationMs != *input.DurationMs) {
+	if p.DurationMs != nil && (input.DurationMs == nil || *p.DurationMs != *input.DurationMs) {
 		return false
 	}
 
-	if p.EndTime != nil && (input.EndTime == nil && *p.EndTime != *input.EndTime) {
+	if p.EndTime != nil && (input.EndTime == nil || *p.EndTime != *input.EndTime) {
 		return false
 	}
 
-	if p.Message != nil && (input.Message == nil && *p.Message != *input.Message) {
+	if p.Message != nil && (input.Message == nil || *p.Message != *input.Message) {
 		return false
 	}
 
-	if p.StartTime != nil && (input.StartTime == nil && *p.StartTime != *input.StartTime) {
+	if p.StartTime != nil && (input.StartTime == nil || *p.StartTime != *input.StartTime) {
 		return false
 	}
 
-	if p.Status != nil && (input.Status == nil && *p.Status != *input.Status) {
+	if p.Status != nil && (input.Status == nil || *p.Status != *input.Status) {
 		return false
 	}
 
@@ -114,59 +114,59 @@ type SynchronizationDetailsOperationPredicate struct {
 
 func (p SynchronizationDetailsOperationPredicate) Matches(input SynchronizationDetails) bool {
 
-	if p.DataSetId != nil && (input.DataSetId == nil && *p.DataSetId != *input.DataSetId) {
+	if p.DataSetId != nil && (input.DataSetId == nil || *p.DataSetId != *input.DataSetId) {
 		return false
 	}
 
-	if p.DurationMs != nil && (input.DurationMs == nil && *p.DurationMs != *input.DurationMs) {
+	if p.DurationMs != nil && (input.DurationMs == nil || *p.DurationMs != *input.DurationMs) {
 		return false
 	}
 
-	if p.EndTime != nil && (input.EndTime == nil && *p.EndTime != *input.EndTime) {
+	if p.EndTime != nil && (input.EndTime == nil || *p.EndTime != *input.EndTime) {
 		return false
 	}
 
-	if p.FilesRead != nil && (input.FilesRead == nil && *p.FilesRead != *input.FilesRead) {
+	if p.FilesRead != nil && (input.FilesRead == nil || *p.FilesRead != *input.FilesRead) {
 		return false
 	}
 
-	if p.FilesWritten != nil && (input.FilesWritten == nil && *p.FilesWritten != *input.FilesWritten) {
+	if p.FilesWritten != nil && (input.FilesWritten == nil || *p.FilesWritten != *input.FilesWritten) {
 		return false
 	}
 
-	if p.Message != nil && (input.Message == nil && *p.Message != *input.Message) {
+	if p.Message != nil && (input.Message == nil || *p.Message != *input.Message) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.RowsCopied != nil && (input.RowsCopied == nil && *p.RowsCopied != *input.RowsCopied) {
+	if p.RowsCopied != nil && (input.RowsCopied == nil || *p.RowsCopied != *input.RowsCopied) {
 		return false
 	}
 
-	if p.RowsRead != nil && (input.RowsRead == nil && *p.RowsRead != *input.RowsRead) {
+	if p.RowsRead != nil && (input.RowsRead == nil || *p.RowsRead != *input.RowsRead) {
 		return false
 	}
 
-	if p.SizeRead != nil && (input.SizeRead == nil && *p.SizeRead != *input.SizeRead) {
+	if p.SizeRead != nil && (input.SizeRead == nil || *p.SizeRead != *input.SizeRead) {
 		return false
 	}
 
-	if p.SizeWritten != nil && (input.SizeWritten == nil && *p.SizeWritten != *input.SizeWritten) {
+	if p.SizeWritten != nil && (input.SizeWritten == nil || *p.SizeWritten != *input.SizeWritten) {
 		return false
 	}
 
-	if p.StartTime != nil && (input.StartTime == nil && *p.StartTime != *input.StartTime) {
+	if p.StartTime != nil && (input.StartTime == nil || *p.StartTime != *input.StartTime) {
 		return false
 	}
 
-	if p.Status != nil && (input.Status == nil && *p.Status != *input.Status) {
+	if p.Status != nil && (input.Status == nil || *p.Status != *input.Status) {
 		return false
 	}
 
-	if p.VCore != nil && (input.VCore == nil && *p.VCore != *input.VCore) {
+	if p.VCore != nil && (input.VCore == nil || *p.VCore != *input.VCore) {
 		return false
 	}
 
diff --git a/resource-manager/datashare/2021-08-01/account/predicates.go b/resource-manager/datashare/2021-08-01/account/predicates.go
index 3796cfad2e4..c71ce792507 100644
--- a/resource-manager/datashare/2021-08-01/account/predicates.go
+++ b/resource-manager/datashare/2021-08-01/account/predicates.go
@@ -12,19 +12,19 @@ type AccountOperationPredicate struct {
 
 func (p AccountOperationPredicate) Matches(input Account) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datashare/2021-08-01/consumerinvitation/predicates.go b/resource-manager/datashare/2021-08-01/consumerinvitation/predicates.go
index a8fbfa8a0d8..4a1c3c46814 100644
--- a/resource-manager/datashare/2021-08-01/consumerinvitation/predicates.go
+++ b/resource-manager/datashare/2021-08-01/consumerinvitation/predicates.go
@@ -11,15 +11,15 @@ type ConsumerInvitationOperationPredicate struct {
 
 func (p ConsumerInvitationOperationPredicate) Matches(input ConsumerInvitation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datashare/2021-08-01/invitation/predicates.go b/resource-manager/datashare/2021-08-01/invitation/predicates.go
index d414b82949e..d3905240ad4 100644
--- a/resource-manager/datashare/2021-08-01/invitation/predicates.go
+++ b/resource-manager/datashare/2021-08-01/invitation/predicates.go
@@ -11,15 +11,15 @@ type InvitationOperationPredicate struct {
 
 func (p InvitationOperationPredicate) Matches(input Invitation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/datashare/2021-08-01/share/predicates.go b/resource-manager/datashare/2021-08-01/share/predicates.go
index 9c67cb84c9c..b2176d6514f 100644
--- a/resource-manager/datashare/2021-08-01/share/predicates.go
+++ b/resource-manager/datashare/2021-08-01/share/predicates.go
@@ -11,15 +11,15 @@ type ProviderShareSubscriptionOperationPredicate struct {
 
 func (p ProviderShareSubscriptionOperationPredicate) Matches(input ProviderShareSubscription) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type ShareOperationPredicate struct {
 
 func (p ShareOperationPredicate) Matches(input Share) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -63,39 +63,39 @@ type ShareSynchronizationOperationPredicate struct {
 
 func (p ShareSynchronizationOperationPredicate) Matches(input ShareSynchronization) bool {
 
-	if p.ConsumerEmail != nil && (input.ConsumerEmail == nil && *p.ConsumerEmail != *input.ConsumerEmail) {
+	if p.ConsumerEmail != nil && (input.ConsumerEmail == nil || *p.ConsumerEmail != *input.ConsumerEmail) {
 		return false
 	}
 
-	if p.ConsumerName != nil && (input.ConsumerName == nil && *p.ConsumerName != *input.ConsumerName) {
+	if p.ConsumerName != nil && (input.ConsumerName == nil || *p.ConsumerName != *input.ConsumerName) {
 		return false
 	}
 
-	if p.ConsumerTenantName != nil && (input.ConsumerTenantName == nil && *p.ConsumerTenantName != *input.ConsumerTenantName) {
+	if p.ConsumerTenantName != nil && (input.ConsumerTenantName == nil || *p.ConsumerTenantName != *input.ConsumerTenantName) {
 		return false
 	}
 
-	if p.DurationMs != nil && (input.DurationMs == nil && *p.DurationMs != *input.DurationMs) {
+	if p.DurationMs != nil && (input.DurationMs == nil || *p.DurationMs != *input.DurationMs) {
 		return false
 	}
 
-	if p.EndTime != nil && (input.EndTime == nil && *p.EndTime != *input.EndTime) {
+	if p.EndTime != nil && (input.EndTime == nil || *p.EndTime != *input.EndTime) {
 		return false
 	}
 
-	if p.Message != nil && (input.Message == nil && *p.Message != *input.Message) {
+	if p.Message != nil && (input.Message == nil || *p.Message != *input.Message) {
 		return false
 	}
 
-	if p.StartTime != nil && (input.StartTime == nil && *p.StartTime != *input.StartTime) {
+	if p.StartTime != nil && (input.StartTime == nil || *p.StartTime != *input.StartTime) {
 		return false
 	}
 
-	if p.Status != nil && (input.Status == nil && *p.Status != *input.Status) {
+	if p.Status != nil && (input.Status == nil || *p.Status != *input.Status) {
 		return false
 	}
 
-	if p.SynchronizationId != nil && (input.SynchronizationId == nil && *p.SynchronizationId != *input.SynchronizationId) {
+	if p.SynchronizationId != nil && (input.SynchronizationId == nil || *p.SynchronizationId != *input.SynchronizationId) {
 		return false
 	}
 
@@ -121,59 +121,59 @@ type SynchronizationDetailsOperationPredicate struct {
 
 func (p SynchronizationDetailsOperationPredicate) Matches(input SynchronizationDetails) bool {
 
-	if p.DataSetId != nil && (input.DataSetId == nil && *p.DataSetId != *input.DataSetId) {
+	if p.DataSetId != nil && (input.DataSetId == nil || *p.DataSetId != *input.DataSetId) {
 		return false
 	}
 
-	if p.DurationMs != nil && (input.DurationMs == nil && *p.DurationMs != *input.DurationMs) {
+	if p.DurationMs != nil && (input.DurationMs == nil || *p.DurationMs != *input.DurationMs) {
 		return false
 	}
 
-	if p.EndTime != nil && (input.EndTime == nil && *p.EndTime != *input.EndTime) {
+	if p.EndTime != nil && (input.EndTime == nil || *p.EndTime != *input.EndTime) {
 		return false
 	}
 
-	if p.FilesRead != nil && (input.FilesRead == nil && *p.FilesRead != *input.FilesRead) {
+	if p.FilesRead != nil && (input.FilesRead == nil || *p.FilesRead != *input.FilesRead) {
 		return false
 	}
 
-	if p.FilesWritten != nil && (input.FilesWritten == nil && *p.FilesWritten != *input.FilesWritten) {
+	if p.FilesWritten != nil && (input.FilesWritten == nil || *p.FilesWritten != *input.FilesWritten) {
 		return false
 	}
 
-	if p.Message != nil && (input.Message == nil && *p.Message != *input.Message) {
+	if p.Message != nil && (input.Message == nil || *p.Message != *input.Message) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.RowsCopied != nil && (input.RowsCopied == nil && *p.RowsCopied != *input.RowsCopied) {
+	if p.RowsCopied != nil && (input.RowsCopied == nil || *p.RowsCopied != *input.RowsCopied) {
 		return false
 	}
 
-	if p.RowsRead != nil && (input.RowsRead == nil && *p.RowsRead != *input.RowsRead) {
+	if p.RowsRead != nil && (input.RowsRead == nil || *p.RowsRead != *input.RowsRead) {
 		return false
 	}
 
-	if p.SizeRead != nil && (input.SizeRead == nil && *p.SizeRead != *input.SizeRead) {
+	if p.SizeRead != nil && (input.SizeRead == nil || *p.SizeRead != *input.SizeRead) {
 		return false
 	}
 
-	if p.SizeWritten != nil && (input.SizeWritten == nil && *p.SizeWritten != *input.SizeWritten) {
+	if p.SizeWritten != nil && (input.SizeWritten == nil || *p.SizeWritten != *input.SizeWritten) {
 		return false
 	}
 
-	if p.StartTime != nil && (input.StartTime == nil && *p.StartTime != *input.StartTime) {
+	if p.StartTime != nil && (input.StartTime == nil || *p.StartTime != *input.StartTime) {
 		return false
 	}
 
-	if p.Status != nil && (input.Status == nil && *p.Status != *input.Status) {
+	if p.Status != nil && (input.Status == nil || *p.Status != *input.Status) {
 		return false
 	}
 
-	if p.VCore != nil && (input.VCore == nil && *p.VCore != *input.VCore) {
+	if p.VCore != nil && (input.VCore == nil || *p.VCore != *input.VCore) {
 		return false
 	}
 
diff --git a/resource-manager/datashare/2021-08-01/sharesubscription/predicates.go b/resource-manager/datashare/2021-08-01/sharesubscription/predicates.go
index 8a50bf48540..403a5d60ca5 100644
--- a/resource-manager/datashare/2021-08-01/sharesubscription/predicates.go
+++ b/resource-manager/datashare/2021-08-01/sharesubscription/predicates.go
@@ -11,15 +11,15 @@ type ConsumerSourceDataSetOperationPredicate struct {
 
 func (p ConsumerSourceDataSetOperationPredicate) Matches(input ConsumerSourceDataSet) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type ShareSubscriptionOperationPredicate struct {
 
 func (p ShareSubscriptionOperationPredicate) Matches(input ShareSubscription) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -60,23 +60,23 @@ type ShareSubscriptionSynchronizationOperationPredicate struct {
 
 func (p ShareSubscriptionSynchronizationOperationPredicate) Matches(input ShareSubscriptionSynchronization) bool {
 
-	if p.DurationMs != nil && (input.DurationMs == nil && *p.DurationMs != *input.DurationMs) {
+	if p.DurationMs != nil && (input.DurationMs == nil || *p.DurationMs != *input.DurationMs) {
 		return false
 	}
 
-	if p.EndTime != nil && (input.EndTime == nil && *p.EndTime != *input.EndTime) {
+	if p.EndTime != nil && (input.EndTime == nil || *p.EndTime != *input.EndTime) {
 		return false
 	}
 
-	if p.Message != nil && (input.Message == nil && *p.Message != *input.Message) {
+	if p.Message != nil && (input.Message == nil || *p.Message != *input.Message) {
 		return false
 	}
 
-	if p.StartTime != nil && (input.StartTime == nil && *p.StartTime != *input.StartTime) {
+	if p.StartTime != nil && (input.StartTime == nil || *p.StartTime != *input.StartTime) {
 		return false
 	}
 
-	if p.Status != nil && (input.Status == nil && *p.Status != *input.Status) {
+	if p.Status != nil && (input.Status == nil || *p.Status != *input.Status) {
 		return false
 	}
 
@@ -114,59 +114,59 @@ type SynchronizationDetailsOperationPredicate struct {
 
 func (p SynchronizationDetailsOperationPredicate) Matches(input SynchronizationDetails) bool {
 
-	if p.DataSetId != nil && (input.DataSetId == nil && *p.DataSetId != *input.DataSetId) {
+	if p.DataSetId != nil && (input.DataSetId == nil || *p.DataSetId != *input.DataSetId) {
 		return false
 	}
 
-	if p.DurationMs != nil && (input.DurationMs == nil && *p.DurationMs != *input.DurationMs) {
+	if p.DurationMs != nil && (input.DurationMs == nil || *p.DurationMs != *input.DurationMs) {
 		return false
 	}
 
-	if p.EndTime != nil && (input.EndTime == nil && *p.EndTime != *input.EndTime) {
+	if p.EndTime != nil && (input.EndTime == nil || *p.EndTime != *input.EndTime) {
 		return false
 	}
 
-	if p.FilesRead != nil && (input.FilesRead == nil && *p.FilesRead != *input.FilesRead) {
+	if p.FilesRead != nil && (input.FilesRead == nil || *p.FilesRead != *input.FilesRead) {
 		return false
 	}
 
-	if p.FilesWritten != nil && (input.FilesWritten == nil && *p.FilesWritten != *input.FilesWritten) {
+	if p.FilesWritten != nil && (input.FilesWritten == nil || *p.FilesWritten != *input.FilesWritten) {
 		return false
 	}
 
-	if p.Message != nil && (input.Message == nil && *p.Message != *input.Message) {
+	if p.Message != nil && (input.Message == nil || *p.Message != *input.Message) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.RowsCopied != nil && (input.RowsCopied == nil && *p.RowsCopied != *input.RowsCopied) {
+	if p.RowsCopied != nil && (input.RowsCopied == nil || *p.RowsCopied != *input.RowsCopied) {
 		return false
 	}
 
-	if p.RowsRead != nil && (input.RowsRead == nil && *p.RowsRead != *input.RowsRead) {
+	if p.RowsRead != nil && (input.RowsRead == nil || *p.RowsRead != *input.RowsRead) {
 		return false
 	}
 
-	if p.SizeRead != nil && (input.SizeRead == nil && *p.SizeRead != *input.SizeRead) {
+	if p.SizeRead != nil && (input.SizeRead == nil || *p.SizeRead != *input.SizeRead) {
 		return false
 	}
 
-	if p.SizeWritten != nil && (input.SizeWritten == nil && *p.SizeWritten != *input.SizeWritten) {
+	if p.SizeWritten != nil && (input.SizeWritten == nil || *p.SizeWritten != *input.SizeWritten) {
 		return false
 	}
 
-	if p.StartTime != nil && (input.StartTime == nil && *p.StartTime != *input.StartTime) {
+	if p.StartTime != nil && (input.StartTime == nil || *p.StartTime != *input.StartTime) {
 		return false
 	}
 
-	if p.Status != nil && (input.Status == nil && *p.Status != *input.Status) {
+	if p.Status != nil && (input.Status == nil || *p.Status != *input.Status) {
 		return false
 	}
 
-	if p.VCore != nil && (input.VCore == nil && *p.VCore != *input.VCore) {
+	if p.VCore != nil && (input.VCore == nil || *p.VCore != *input.VCore) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2021-09-03-preview/application/predicates.go b/resource-manager/desktopvirtualization/2021-09-03-preview/application/predicates.go
index ed0ab5da058..14cd75c9a58 100644
--- a/resource-manager/desktopvirtualization/2021-09-03-preview/application/predicates.go
+++ b/resource-manager/desktopvirtualization/2021-09-03-preview/application/predicates.go
@@ -11,15 +11,15 @@ type ApplicationOperationPredicate struct {
 
 func (p ApplicationOperationPredicate) Matches(input Application) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2021-09-03-preview/applicationgroup/predicates.go b/resource-manager/desktopvirtualization/2021-09-03-preview/applicationgroup/predicates.go
index b0715a01186..1eee35bc804 100644
--- a/resource-manager/desktopvirtualization/2021-09-03-preview/applicationgroup/predicates.go
+++ b/resource-manager/desktopvirtualization/2021-09-03-preview/applicationgroup/predicates.go
@@ -15,31 +15,31 @@ type ApplicationGroupOperationPredicate struct {
 
 func (p ApplicationGroupOperationPredicate) Matches(input ApplicationGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2021-09-03-preview/desktop/predicates.go b/resource-manager/desktopvirtualization/2021-09-03-preview/desktop/predicates.go
index 8fd665c193a..7d69c2ba266 100644
--- a/resource-manager/desktopvirtualization/2021-09-03-preview/desktop/predicates.go
+++ b/resource-manager/desktopvirtualization/2021-09-03-preview/desktop/predicates.go
@@ -11,15 +11,15 @@ type DesktopOperationPredicate struct {
 
 func (p DesktopOperationPredicate) Matches(input Desktop) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2021-09-03-preview/hostpool/predicates.go b/resource-manager/desktopvirtualization/2021-09-03-preview/hostpool/predicates.go
index 2098b9ccec7..1b58a956d79 100644
--- a/resource-manager/desktopvirtualization/2021-09-03-preview/hostpool/predicates.go
+++ b/resource-manager/desktopvirtualization/2021-09-03-preview/hostpool/predicates.go
@@ -15,31 +15,31 @@ type HostPoolOperationPredicate struct {
 
 func (p HostPoolOperationPredicate) Matches(input HostPool) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2021-09-03-preview/msiximage/predicates.go b/resource-manager/desktopvirtualization/2021-09-03-preview/msiximage/predicates.go
index 2f86bf147b8..a91fc8b3c1d 100644
--- a/resource-manager/desktopvirtualization/2021-09-03-preview/msiximage/predicates.go
+++ b/resource-manager/desktopvirtualization/2021-09-03-preview/msiximage/predicates.go
@@ -11,15 +11,15 @@ type ExpandMsixImageOperationPredicate struct {
 
 func (p ExpandMsixImageOperationPredicate) Matches(input ExpandMsixImage) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2021-09-03-preview/msixpackage/predicates.go b/resource-manager/desktopvirtualization/2021-09-03-preview/msixpackage/predicates.go
index abd6fdea89b..ac7727901eb 100644
--- a/resource-manager/desktopvirtualization/2021-09-03-preview/msixpackage/predicates.go
+++ b/resource-manager/desktopvirtualization/2021-09-03-preview/msixpackage/predicates.go
@@ -11,15 +11,15 @@ type MSIXPackageOperationPredicate struct {
 
 func (p MSIXPackageOperationPredicate) Matches(input MSIXPackage) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2021-09-03-preview/privatelink/predicates.go b/resource-manager/desktopvirtualization/2021-09-03-preview/privatelink/predicates.go
index 0d6cc16aec1..c26c480e357 100644
--- a/resource-manager/desktopvirtualization/2021-09-03-preview/privatelink/predicates.go
+++ b/resource-manager/desktopvirtualization/2021-09-03-preview/privatelink/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionWithSystemDataOperationPredicate struct {
 
 func (p PrivateEndpointConnectionWithSystemDataOperationPredicate) Matches(input PrivateEndpointConnectionWithSystemData) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2021-09-03-preview/scalingplan/predicates.go b/resource-manager/desktopvirtualization/2021-09-03-preview/scalingplan/predicates.go
index 4ff125415c4..216a6d999ec 100644
--- a/resource-manager/desktopvirtualization/2021-09-03-preview/scalingplan/predicates.go
+++ b/resource-manager/desktopvirtualization/2021-09-03-preview/scalingplan/predicates.go
@@ -15,31 +15,31 @@ type ScalingPlanOperationPredicate struct {
 
 func (p ScalingPlanOperationPredicate) Matches(input ScalingPlan) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2021-09-03-preview/sessionhost/predicates.go b/resource-manager/desktopvirtualization/2021-09-03-preview/sessionhost/predicates.go
index 3ab28725d7e..e5e5d8df947 100644
--- a/resource-manager/desktopvirtualization/2021-09-03-preview/sessionhost/predicates.go
+++ b/resource-manager/desktopvirtualization/2021-09-03-preview/sessionhost/predicates.go
@@ -11,15 +11,15 @@ type SessionHostOperationPredicate struct {
 
 func (p SessionHostOperationPredicate) Matches(input SessionHost) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2021-09-03-preview/startmenuitem/predicates.go b/resource-manager/desktopvirtualization/2021-09-03-preview/startmenuitem/predicates.go
index 15884d67ff5..d20fe5cba0c 100644
--- a/resource-manager/desktopvirtualization/2021-09-03-preview/startmenuitem/predicates.go
+++ b/resource-manager/desktopvirtualization/2021-09-03-preview/startmenuitem/predicates.go
@@ -11,15 +11,15 @@ type StartMenuItemOperationPredicate struct {
 
 func (p StartMenuItemOperationPredicate) Matches(input StartMenuItem) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2021-09-03-preview/usersession/predicates.go b/resource-manager/desktopvirtualization/2021-09-03-preview/usersession/predicates.go
index 45a1032170a..6d37fbea4d8 100644
--- a/resource-manager/desktopvirtualization/2021-09-03-preview/usersession/predicates.go
+++ b/resource-manager/desktopvirtualization/2021-09-03-preview/usersession/predicates.go
@@ -11,15 +11,15 @@ type UserSessionOperationPredicate struct {
 
 func (p UserSessionOperationPredicate) Matches(input UserSession) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2021-09-03-preview/workspace/predicates.go b/resource-manager/desktopvirtualization/2021-09-03-preview/workspace/predicates.go
index fb0a53521a0..dfe07c2b267 100644
--- a/resource-manager/desktopvirtualization/2021-09-03-preview/workspace/predicates.go
+++ b/resource-manager/desktopvirtualization/2021-09-03-preview/workspace/predicates.go
@@ -15,31 +15,31 @@ type WorkspaceOperationPredicate struct {
 
 func (p WorkspaceOperationPredicate) Matches(input Workspace) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-02-10-preview/application/predicates.go b/resource-manager/desktopvirtualization/2022-02-10-preview/application/predicates.go
index ed0ab5da058..14cd75c9a58 100644
--- a/resource-manager/desktopvirtualization/2022-02-10-preview/application/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-02-10-preview/application/predicates.go
@@ -11,15 +11,15 @@ type ApplicationOperationPredicate struct {
 
 func (p ApplicationOperationPredicate) Matches(input Application) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-02-10-preview/applicationgroup/predicates.go b/resource-manager/desktopvirtualization/2022-02-10-preview/applicationgroup/predicates.go
index b0715a01186..1eee35bc804 100644
--- a/resource-manager/desktopvirtualization/2022-02-10-preview/applicationgroup/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-02-10-preview/applicationgroup/predicates.go
@@ -15,31 +15,31 @@ type ApplicationGroupOperationPredicate struct {
 
 func (p ApplicationGroupOperationPredicate) Matches(input ApplicationGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-02-10-preview/desktop/predicates.go b/resource-manager/desktopvirtualization/2022-02-10-preview/desktop/predicates.go
index 8fd665c193a..7d69c2ba266 100644
--- a/resource-manager/desktopvirtualization/2022-02-10-preview/desktop/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-02-10-preview/desktop/predicates.go
@@ -11,15 +11,15 @@ type DesktopOperationPredicate struct {
 
 func (p DesktopOperationPredicate) Matches(input Desktop) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-02-10-preview/hostpool/predicates.go b/resource-manager/desktopvirtualization/2022-02-10-preview/hostpool/predicates.go
index 2098b9ccec7..1b58a956d79 100644
--- a/resource-manager/desktopvirtualization/2022-02-10-preview/hostpool/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-02-10-preview/hostpool/predicates.go
@@ -15,31 +15,31 @@ type HostPoolOperationPredicate struct {
 
 func (p HostPoolOperationPredicate) Matches(input HostPool) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-02-10-preview/msiximage/predicates.go b/resource-manager/desktopvirtualization/2022-02-10-preview/msiximage/predicates.go
index 2f86bf147b8..a91fc8b3c1d 100644
--- a/resource-manager/desktopvirtualization/2022-02-10-preview/msiximage/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-02-10-preview/msiximage/predicates.go
@@ -11,15 +11,15 @@ type ExpandMsixImageOperationPredicate struct {
 
 func (p ExpandMsixImageOperationPredicate) Matches(input ExpandMsixImage) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-02-10-preview/msixpackage/predicates.go b/resource-manager/desktopvirtualization/2022-02-10-preview/msixpackage/predicates.go
index abd6fdea89b..ac7727901eb 100644
--- a/resource-manager/desktopvirtualization/2022-02-10-preview/msixpackage/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-02-10-preview/msixpackage/predicates.go
@@ -11,15 +11,15 @@ type MSIXPackageOperationPredicate struct {
 
 func (p MSIXPackageOperationPredicate) Matches(input MSIXPackage) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-02-10-preview/privatelink/predicates.go b/resource-manager/desktopvirtualization/2022-02-10-preview/privatelink/predicates.go
index 0d6cc16aec1..c26c480e357 100644
--- a/resource-manager/desktopvirtualization/2022-02-10-preview/privatelink/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-02-10-preview/privatelink/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionWithSystemDataOperationPredicate struct {
 
 func (p PrivateEndpointConnectionWithSystemDataOperationPredicate) Matches(input PrivateEndpointConnectionWithSystemData) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-02-10-preview/scalingplan/predicates.go b/resource-manager/desktopvirtualization/2022-02-10-preview/scalingplan/predicates.go
index 4ff125415c4..216a6d999ec 100644
--- a/resource-manager/desktopvirtualization/2022-02-10-preview/scalingplan/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-02-10-preview/scalingplan/predicates.go
@@ -15,31 +15,31 @@ type ScalingPlanOperationPredicate struct {
 
 func (p ScalingPlanOperationPredicate) Matches(input ScalingPlan) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-02-10-preview/sessionhost/predicates.go b/resource-manager/desktopvirtualization/2022-02-10-preview/sessionhost/predicates.go
index 3ab28725d7e..e5e5d8df947 100644
--- a/resource-manager/desktopvirtualization/2022-02-10-preview/sessionhost/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-02-10-preview/sessionhost/predicates.go
@@ -11,15 +11,15 @@ type SessionHostOperationPredicate struct {
 
 func (p SessionHostOperationPredicate) Matches(input SessionHost) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-02-10-preview/startmenuitem/predicates.go b/resource-manager/desktopvirtualization/2022-02-10-preview/startmenuitem/predicates.go
index 15884d67ff5..d20fe5cba0c 100644
--- a/resource-manager/desktopvirtualization/2022-02-10-preview/startmenuitem/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-02-10-preview/startmenuitem/predicates.go
@@ -11,15 +11,15 @@ type StartMenuItemOperationPredicate struct {
 
 func (p StartMenuItemOperationPredicate) Matches(input StartMenuItem) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-02-10-preview/usersession/predicates.go b/resource-manager/desktopvirtualization/2022-02-10-preview/usersession/predicates.go
index 45a1032170a..6d37fbea4d8 100644
--- a/resource-manager/desktopvirtualization/2022-02-10-preview/usersession/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-02-10-preview/usersession/predicates.go
@@ -11,15 +11,15 @@ type UserSessionOperationPredicate struct {
 
 func (p UserSessionOperationPredicate) Matches(input UserSession) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-02-10-preview/workspace/predicates.go b/resource-manager/desktopvirtualization/2022-02-10-preview/workspace/predicates.go
index fb0a53521a0..dfe07c2b267 100644
--- a/resource-manager/desktopvirtualization/2022-02-10-preview/workspace/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-02-10-preview/workspace/predicates.go
@@ -15,31 +15,31 @@ type WorkspaceOperationPredicate struct {
 
 func (p WorkspaceOperationPredicate) Matches(input Workspace) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-09-09/application/predicates.go b/resource-manager/desktopvirtualization/2022-09-09/application/predicates.go
index ed0ab5da058..14cd75c9a58 100644
--- a/resource-manager/desktopvirtualization/2022-09-09/application/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-09-09/application/predicates.go
@@ -11,15 +11,15 @@ type ApplicationOperationPredicate struct {
 
 func (p ApplicationOperationPredicate) Matches(input Application) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-09-09/applicationgroup/predicates.go b/resource-manager/desktopvirtualization/2022-09-09/applicationgroup/predicates.go
index b0715a01186..1eee35bc804 100644
--- a/resource-manager/desktopvirtualization/2022-09-09/applicationgroup/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-09-09/applicationgroup/predicates.go
@@ -15,31 +15,31 @@ type ApplicationGroupOperationPredicate struct {
 
 func (p ApplicationGroupOperationPredicate) Matches(input ApplicationGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-09-09/desktop/predicates.go b/resource-manager/desktopvirtualization/2022-09-09/desktop/predicates.go
index 8fd665c193a..7d69c2ba266 100644
--- a/resource-manager/desktopvirtualization/2022-09-09/desktop/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-09-09/desktop/predicates.go
@@ -11,15 +11,15 @@ type DesktopOperationPredicate struct {
 
 func (p DesktopOperationPredicate) Matches(input Desktop) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-09-09/hostpool/predicates.go b/resource-manager/desktopvirtualization/2022-09-09/hostpool/predicates.go
index 2098b9ccec7..1b58a956d79 100644
--- a/resource-manager/desktopvirtualization/2022-09-09/hostpool/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-09-09/hostpool/predicates.go
@@ -15,31 +15,31 @@ type HostPoolOperationPredicate struct {
 
 func (p HostPoolOperationPredicate) Matches(input HostPool) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-09-09/msiximage/predicates.go b/resource-manager/desktopvirtualization/2022-09-09/msiximage/predicates.go
index 2f86bf147b8..a91fc8b3c1d 100644
--- a/resource-manager/desktopvirtualization/2022-09-09/msiximage/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-09-09/msiximage/predicates.go
@@ -11,15 +11,15 @@ type ExpandMsixImageOperationPredicate struct {
 
 func (p ExpandMsixImageOperationPredicate) Matches(input ExpandMsixImage) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-09-09/msixpackage/predicates.go b/resource-manager/desktopvirtualization/2022-09-09/msixpackage/predicates.go
index abd6fdea89b..ac7727901eb 100644
--- a/resource-manager/desktopvirtualization/2022-09-09/msixpackage/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-09-09/msixpackage/predicates.go
@@ -11,15 +11,15 @@ type MSIXPackageOperationPredicate struct {
 
 func (p MSIXPackageOperationPredicate) Matches(input MSIXPackage) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-09-09/scalingplan/predicates.go b/resource-manager/desktopvirtualization/2022-09-09/scalingplan/predicates.go
index 4ff125415c4..216a6d999ec 100644
--- a/resource-manager/desktopvirtualization/2022-09-09/scalingplan/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-09-09/scalingplan/predicates.go
@@ -15,31 +15,31 @@ type ScalingPlanOperationPredicate struct {
 
 func (p ScalingPlanOperationPredicate) Matches(input ScalingPlan) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-09-09/scalingplanpooledschedule/predicates.go b/resource-manager/desktopvirtualization/2022-09-09/scalingplanpooledschedule/predicates.go
index ac107c3056d..9ff82179406 100644
--- a/resource-manager/desktopvirtualization/2022-09-09/scalingplanpooledschedule/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-09-09/scalingplanpooledschedule/predicates.go
@@ -11,15 +11,15 @@ type ScalingPlanPooledScheduleOperationPredicate struct {
 
 func (p ScalingPlanPooledScheduleOperationPredicate) Matches(input ScalingPlanPooledSchedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-09-09/sessionhost/predicates.go b/resource-manager/desktopvirtualization/2022-09-09/sessionhost/predicates.go
index 3ab28725d7e..e5e5d8df947 100644
--- a/resource-manager/desktopvirtualization/2022-09-09/sessionhost/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-09-09/sessionhost/predicates.go
@@ -11,15 +11,15 @@ type SessionHostOperationPredicate struct {
 
 func (p SessionHostOperationPredicate) Matches(input SessionHost) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-09-09/startmenuitem/predicates.go b/resource-manager/desktopvirtualization/2022-09-09/startmenuitem/predicates.go
index 15884d67ff5..d20fe5cba0c 100644
--- a/resource-manager/desktopvirtualization/2022-09-09/startmenuitem/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-09-09/startmenuitem/predicates.go
@@ -11,15 +11,15 @@ type StartMenuItemOperationPredicate struct {
 
 func (p StartMenuItemOperationPredicate) Matches(input StartMenuItem) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-09-09/usersession/predicates.go b/resource-manager/desktopvirtualization/2022-09-09/usersession/predicates.go
index 45a1032170a..6d37fbea4d8 100644
--- a/resource-manager/desktopvirtualization/2022-09-09/usersession/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-09-09/usersession/predicates.go
@@ -11,15 +11,15 @@ type UserSessionOperationPredicate struct {
 
 func (p UserSessionOperationPredicate) Matches(input UserSession) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/desktopvirtualization/2022-09-09/workspace/predicates.go b/resource-manager/desktopvirtualization/2022-09-09/workspace/predicates.go
index fb0a53521a0..dfe07c2b267 100644
--- a/resource-manager/desktopvirtualization/2022-09-09/workspace/predicates.go
+++ b/resource-manager/desktopvirtualization/2022-09-09/workspace/predicates.go
@@ -15,31 +15,31 @@ type WorkspaceOperationPredicate struct {
 
 func (p WorkspaceOperationPredicate) Matches(input Workspace) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/deviceprovisioningservices/2022-02-05/iotdpsresource/predicates.go b/resource-manager/deviceprovisioningservices/2022-02-05/iotdpsresource/predicates.go
index 592855b2171..16a003fcf7a 100644
--- a/resource-manager/deviceprovisioningservices/2022-02-05/iotdpsresource/predicates.go
+++ b/resource-manager/deviceprovisioningservices/2022-02-05/iotdpsresource/predicates.go
@@ -21,11 +21,11 @@ type ProvisioningServiceDescriptionOperationPredicate struct {
 
 func (p ProvisioningServiceDescriptionOperationPredicate) Matches(input ProvisioningServiceDescription) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -33,11 +33,11 @@ func (p ProvisioningServiceDescriptionOperationPredicate) Matches(input Provisio
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -56,11 +56,11 @@ func (p SharedAccessSignatureAuthorizationRuleAccessRightsDescriptionOperationPr
 		return false
 	}
 
-	if p.PrimaryKey != nil && (input.PrimaryKey == nil && *p.PrimaryKey != *input.PrimaryKey) {
+	if p.PrimaryKey != nil && (input.PrimaryKey == nil || *p.PrimaryKey != *input.PrimaryKey) {
 		return false
 	}
 
-	if p.SecondaryKey != nil && (input.SecondaryKey == nil && *p.SecondaryKey != *input.SecondaryKey) {
+	if p.SecondaryKey != nil && (input.SecondaryKey == nil || *p.SecondaryKey != *input.SecondaryKey) {
 		return false
 	}
 
diff --git a/resource-manager/deviceprovisioningservices/2022-12-12/iotdpsresource/predicates.go b/resource-manager/deviceprovisioningservices/2022-12-12/iotdpsresource/predicates.go
index a39c2f185af..74d02372e6b 100644
--- a/resource-manager/deviceprovisioningservices/2022-12-12/iotdpsresource/predicates.go
+++ b/resource-manager/deviceprovisioningservices/2022-12-12/iotdpsresource/predicates.go
@@ -23,11 +23,11 @@ type ProvisioningServiceDescriptionOperationPredicate struct {
 
 func (p ProvisioningServiceDescriptionOperationPredicate) Matches(input ProvisioningServiceDescription) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -35,19 +35,19 @@ func (p ProvisioningServiceDescriptionOperationPredicate) Matches(input Provisio
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Resourcegroup != nil && (input.Resourcegroup == nil && *p.Resourcegroup != *input.Resourcegroup) {
+	if p.Resourcegroup != nil && (input.Resourcegroup == nil || *p.Resourcegroup != *input.Resourcegroup) {
 		return false
 	}
 
-	if p.Subscriptionid != nil && (input.Subscriptionid == nil && *p.Subscriptionid != *input.Subscriptionid) {
+	if p.Subscriptionid != nil && (input.Subscriptionid == nil || *p.Subscriptionid != *input.Subscriptionid) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -66,11 +66,11 @@ func (p SharedAccessSignatureAuthorizationRuleAccessRightsDescriptionOperationPr
 		return false
 	}
 
-	if p.PrimaryKey != nil && (input.PrimaryKey == nil && *p.PrimaryKey != *input.PrimaryKey) {
+	if p.PrimaryKey != nil && (input.PrimaryKey == nil || *p.PrimaryKey != *input.PrimaryKey) {
 		return false
 	}
 
-	if p.SecondaryKey != nil && (input.SecondaryKey == nil && *p.SecondaryKey != *input.SecondaryKey) {
+	if p.SecondaryKey != nil && (input.SecondaryKey == nil || *p.SecondaryKey != *input.SecondaryKey) {
 		return false
 	}
 
diff --git a/resource-manager/deviceupdate/2022-10-01/deviceupdates/predicates.go b/resource-manager/deviceupdate/2022-10-01/deviceupdates/predicates.go
index ac08d782b79..ac2a77f6ecd 100644
--- a/resource-manager/deviceupdate/2022-10-01/deviceupdates/predicates.go
+++ b/resource-manager/deviceupdate/2022-10-01/deviceupdates/predicates.go
@@ -12,7 +12,7 @@ type AccountOperationPredicate struct {
 
 func (p AccountOperationPredicate) Matches(input Account) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p AccountOperationPredicate) Matches(input Account) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,7 +40,7 @@ type InstanceOperationPredicate struct {
 
 func (p InstanceOperationPredicate) Matches(input Instance) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -48,11 +48,11 @@ func (p InstanceOperationPredicate) Matches(input Instance) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/deviceupdate/2023-07-01/deviceupdates/predicates.go b/resource-manager/deviceupdate/2023-07-01/deviceupdates/predicates.go
index ac08d782b79..ac2a77f6ecd 100644
--- a/resource-manager/deviceupdate/2023-07-01/deviceupdates/predicates.go
+++ b/resource-manager/deviceupdate/2023-07-01/deviceupdates/predicates.go
@@ -12,7 +12,7 @@ type AccountOperationPredicate struct {
 
 func (p AccountOperationPredicate) Matches(input Account) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p AccountOperationPredicate) Matches(input Account) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,7 +40,7 @@ type InstanceOperationPredicate struct {
 
 func (p InstanceOperationPredicate) Matches(input Instance) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -48,11 +48,11 @@ func (p InstanceOperationPredicate) Matches(input Instance) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/devtestlab/2018-09-15/armtemplates/predicates.go b/resource-manager/devtestlab/2018-09-15/armtemplates/predicates.go
index 6410ec02f47..e50bb9ba185 100644
--- a/resource-manager/devtestlab/2018-09-15/armtemplates/predicates.go
+++ b/resource-manager/devtestlab/2018-09-15/armtemplates/predicates.go
@@ -12,19 +12,19 @@ type ArmTemplateOperationPredicate struct {
 
 func (p ArmTemplateOperationPredicate) Matches(input ArmTemplate) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/devtestlab/2018-09-15/artifacts/predicates.go b/resource-manager/devtestlab/2018-09-15/artifacts/predicates.go
index 18ac235a007..d884da3c424 100644
--- a/resource-manager/devtestlab/2018-09-15/artifacts/predicates.go
+++ b/resource-manager/devtestlab/2018-09-15/artifacts/predicates.go
@@ -12,19 +12,19 @@ type ArtifactOperationPredicate struct {
 
 func (p ArtifactOperationPredicate) Matches(input Artifact) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/devtestlab/2018-09-15/artifactsources/predicates.go b/resource-manager/devtestlab/2018-09-15/artifactsources/predicates.go
index 7179a8f1ddf..abf6b91cd1c 100644
--- a/resource-manager/devtestlab/2018-09-15/artifactsources/predicates.go
+++ b/resource-manager/devtestlab/2018-09-15/artifactsources/predicates.go
@@ -12,19 +12,19 @@ type ArtifactSourceOperationPredicate struct {
 
 func (p ArtifactSourceOperationPredicate) Matches(input ArtifactSource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/devtestlab/2018-09-15/customimages/predicates.go b/resource-manager/devtestlab/2018-09-15/customimages/predicates.go
index 294ec48e20b..f3208d93b52 100644
--- a/resource-manager/devtestlab/2018-09-15/customimages/predicates.go
+++ b/resource-manager/devtestlab/2018-09-15/customimages/predicates.go
@@ -12,19 +12,19 @@ type CustomImageOperationPredicate struct {
 
 func (p CustomImageOperationPredicate) Matches(input CustomImage) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/devtestlab/2018-09-15/disks/predicates.go b/resource-manager/devtestlab/2018-09-15/disks/predicates.go
index c5a9af12576..df643953082 100644
--- a/resource-manager/devtestlab/2018-09-15/disks/predicates.go
+++ b/resource-manager/devtestlab/2018-09-15/disks/predicates.go
@@ -12,19 +12,19 @@ type DiskOperationPredicate struct {
 
 func (p DiskOperationPredicate) Matches(input Disk) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/devtestlab/2018-09-15/environments/predicates.go b/resource-manager/devtestlab/2018-09-15/environments/predicates.go
index 1885d095bf2..549563ba28f 100644
--- a/resource-manager/devtestlab/2018-09-15/environments/predicates.go
+++ b/resource-manager/devtestlab/2018-09-15/environments/predicates.go
@@ -12,19 +12,19 @@ type DtlEnvironmentOperationPredicate struct {
 
 func (p DtlEnvironmentOperationPredicate) Matches(input DtlEnvironment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/devtestlab/2018-09-15/formulas/predicates.go b/resource-manager/devtestlab/2018-09-15/formulas/predicates.go
index 3aa7c4ecd30..209f2cc7213 100644
--- a/resource-manager/devtestlab/2018-09-15/formulas/predicates.go
+++ b/resource-manager/devtestlab/2018-09-15/formulas/predicates.go
@@ -12,19 +12,19 @@ type FormulaOperationPredicate struct {
 
 func (p FormulaOperationPredicate) Matches(input Formula) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/devtestlab/2018-09-15/galleryimages/predicates.go b/resource-manager/devtestlab/2018-09-15/galleryimages/predicates.go
index ef5ba0b6b8c..7d77605262e 100644
--- a/resource-manager/devtestlab/2018-09-15/galleryimages/predicates.go
+++ b/resource-manager/devtestlab/2018-09-15/galleryimages/predicates.go
@@ -12,19 +12,19 @@ type GalleryImageOperationPredicate struct {
 
 func (p GalleryImageOperationPredicate) Matches(input GalleryImage) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/devtestlab/2018-09-15/globalschedules/predicates.go b/resource-manager/devtestlab/2018-09-15/globalschedules/predicates.go
index 9e12ba9e225..834a5123af0 100644
--- a/resource-manager/devtestlab/2018-09-15/globalschedules/predicates.go
+++ b/resource-manager/devtestlab/2018-09-15/globalschedules/predicates.go
@@ -12,19 +12,19 @@ type ScheduleOperationPredicate struct {
 
 func (p ScheduleOperationPredicate) Matches(input Schedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/devtestlab/2018-09-15/labs/predicates.go b/resource-manager/devtestlab/2018-09-15/labs/predicates.go
index 2b1a7663e52..690bddf0434 100644
--- a/resource-manager/devtestlab/2018-09-15/labs/predicates.go
+++ b/resource-manager/devtestlab/2018-09-15/labs/predicates.go
@@ -12,19 +12,19 @@ type LabOperationPredicate struct {
 
 func (p LabOperationPredicate) Matches(input Lab) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -37,7 +37,7 @@ type LabVhdOperationPredicate struct {
 
 func (p LabVhdOperationPredicate) Matches(input LabVhd) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
diff --git a/resource-manager/devtestlab/2018-09-15/notificationchannels/predicates.go b/resource-manager/devtestlab/2018-09-15/notificationchannels/predicates.go
index b4aa5542768..1145f27c666 100644
--- a/resource-manager/devtestlab/2018-09-15/notificationchannels/predicates.go
+++ b/resource-manager/devtestlab/2018-09-15/notificationchannels/predicates.go
@@ -12,19 +12,19 @@ type NotificationChannelOperationPredicate struct {
 
 func (p NotificationChannelOperationPredicate) Matches(input NotificationChannel) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/devtestlab/2018-09-15/policies/predicates.go b/resource-manager/devtestlab/2018-09-15/policies/predicates.go
index b72e230d069..c161b7d866b 100644
--- a/resource-manager/devtestlab/2018-09-15/policies/predicates.go
+++ b/resource-manager/devtestlab/2018-09-15/policies/predicates.go
@@ -12,19 +12,19 @@ type PolicyOperationPredicate struct {
 
 func (p PolicyOperationPredicate) Matches(input Policy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/devtestlab/2018-09-15/schedules/predicates.go b/resource-manager/devtestlab/2018-09-15/schedules/predicates.go
index 01992045e37..52d77ea8869 100644
--- a/resource-manager/devtestlab/2018-09-15/schedules/predicates.go
+++ b/resource-manager/devtestlab/2018-09-15/schedules/predicates.go
@@ -12,19 +12,19 @@ type ScheduleOperationPredicate struct {
 
 func (p ScheduleOperationPredicate) Matches(input Schedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/devtestlab/2018-09-15/secrets/predicates.go b/resource-manager/devtestlab/2018-09-15/secrets/predicates.go
index 9d694420242..1eb8d4feaa8 100644
--- a/resource-manager/devtestlab/2018-09-15/secrets/predicates.go
+++ b/resource-manager/devtestlab/2018-09-15/secrets/predicates.go
@@ -12,19 +12,19 @@ type SecretOperationPredicate struct {
 
 func (p SecretOperationPredicate) Matches(input Secret) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/devtestlab/2018-09-15/servicefabrics/predicates.go b/resource-manager/devtestlab/2018-09-15/servicefabrics/predicates.go
index 1ff9771dc23..7d40fecf180 100644
--- a/resource-manager/devtestlab/2018-09-15/servicefabrics/predicates.go
+++ b/resource-manager/devtestlab/2018-09-15/servicefabrics/predicates.go
@@ -12,19 +12,19 @@ type ServiceFabricOperationPredicate struct {
 
 func (p ServiceFabricOperationPredicate) Matches(input ServiceFabric) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/devtestlab/2018-09-15/servicefabricschedules/predicates.go b/resource-manager/devtestlab/2018-09-15/servicefabricschedules/predicates.go
index 65068eb17d9..4dbca4a105c 100644
--- a/resource-manager/devtestlab/2018-09-15/servicefabricschedules/predicates.go
+++ b/resource-manager/devtestlab/2018-09-15/servicefabricschedules/predicates.go
@@ -12,19 +12,19 @@ type ScheduleOperationPredicate struct {
 
 func (p ScheduleOperationPredicate) Matches(input Schedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/devtestlab/2018-09-15/users/predicates.go b/resource-manager/devtestlab/2018-09-15/users/predicates.go
index e12b5eeb4c9..d044b63673d 100644
--- a/resource-manager/devtestlab/2018-09-15/users/predicates.go
+++ b/resource-manager/devtestlab/2018-09-15/users/predicates.go
@@ -12,19 +12,19 @@ type UserOperationPredicate struct {
 
 func (p UserOperationPredicate) Matches(input User) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/devtestlab/2018-09-15/virtualmachines/predicates.go b/resource-manager/devtestlab/2018-09-15/virtualmachines/predicates.go
index 42759466f67..bf7918f6493 100644
--- a/resource-manager/devtestlab/2018-09-15/virtualmachines/predicates.go
+++ b/resource-manager/devtestlab/2018-09-15/virtualmachines/predicates.go
@@ -12,19 +12,19 @@ type LabVirtualMachineOperationPredicate struct {
 
 func (p LabVirtualMachineOperationPredicate) Matches(input LabVirtualMachine) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/devtestlab/2018-09-15/virtualmachineschedules/predicates.go b/resource-manager/devtestlab/2018-09-15/virtualmachineschedules/predicates.go
index e1a789160e0..8e637b27c1b 100644
--- a/resource-manager/devtestlab/2018-09-15/virtualmachineschedules/predicates.go
+++ b/resource-manager/devtestlab/2018-09-15/virtualmachineschedules/predicates.go
@@ -12,19 +12,19 @@ type ScheduleOperationPredicate struct {
 
 func (p ScheduleOperationPredicate) Matches(input Schedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/devtestlab/2018-09-15/virtualnetworks/predicates.go b/resource-manager/devtestlab/2018-09-15/virtualnetworks/predicates.go
index d64373a9cc9..fd2246b6f20 100644
--- a/resource-manager/devtestlab/2018-09-15/virtualnetworks/predicates.go
+++ b/resource-manager/devtestlab/2018-09-15/virtualnetworks/predicates.go
@@ -12,19 +12,19 @@ type VirtualNetworkOperationPredicate struct {
 
 func (p VirtualNetworkOperationPredicate) Matches(input VirtualNetwork) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/digitaltwins/2020-12-01/digitaltwinsinstance/predicates.go b/resource-manager/digitaltwins/2020-12-01/digitaltwinsinstance/predicates.go
index be50bb940f7..7b79cd09737 100644
--- a/resource-manager/digitaltwins/2020-12-01/digitaltwinsinstance/predicates.go
+++ b/resource-manager/digitaltwins/2020-12-01/digitaltwinsinstance/predicates.go
@@ -12,7 +12,7 @@ type DigitalTwinsDescriptionOperationPredicate struct {
 
 func (p DigitalTwinsDescriptionOperationPredicate) Matches(input DigitalTwinsDescription) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p DigitalTwinsDescriptionOperationPredicate) Matches(input DigitalTwinsDes
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/digitaltwins/2020-12-01/endpoints/predicates.go b/resource-manager/digitaltwins/2020-12-01/endpoints/predicates.go
index 2a4339e68b0..97d55d1bf2a 100644
--- a/resource-manager/digitaltwins/2020-12-01/endpoints/predicates.go
+++ b/resource-manager/digitaltwins/2020-12-01/endpoints/predicates.go
@@ -11,15 +11,15 @@ type DigitalTwinsEndpointResourceOperationPredicate struct {
 
 func (p DigitalTwinsEndpointResourceOperationPredicate) Matches(input DigitalTwinsEndpointResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/digitaltwins/2022-10-31/digitaltwinsinstance/predicates.go b/resource-manager/digitaltwins/2022-10-31/digitaltwinsinstance/predicates.go
index be50bb940f7..7b79cd09737 100644
--- a/resource-manager/digitaltwins/2022-10-31/digitaltwinsinstance/predicates.go
+++ b/resource-manager/digitaltwins/2022-10-31/digitaltwinsinstance/predicates.go
@@ -12,7 +12,7 @@ type DigitalTwinsDescriptionOperationPredicate struct {
 
 func (p DigitalTwinsDescriptionOperationPredicate) Matches(input DigitalTwinsDescription) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p DigitalTwinsDescriptionOperationPredicate) Matches(input DigitalTwinsDes
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/digitaltwins/2022-10-31/endpoints/predicates.go b/resource-manager/digitaltwins/2022-10-31/endpoints/predicates.go
index 2a4339e68b0..97d55d1bf2a 100644
--- a/resource-manager/digitaltwins/2022-10-31/endpoints/predicates.go
+++ b/resource-manager/digitaltwins/2022-10-31/endpoints/predicates.go
@@ -11,15 +11,15 @@ type DigitalTwinsEndpointResourceOperationPredicate struct {
 
 func (p DigitalTwinsEndpointResourceOperationPredicate) Matches(input DigitalTwinsEndpointResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/digitaltwins/2022-10-31/timeseriesdatabaseconnections/predicates.go b/resource-manager/digitaltwins/2022-10-31/timeseriesdatabaseconnections/predicates.go
index 1669ddb53ef..024bf364426 100644
--- a/resource-manager/digitaltwins/2022-10-31/timeseriesdatabaseconnections/predicates.go
+++ b/resource-manager/digitaltwins/2022-10-31/timeseriesdatabaseconnections/predicates.go
@@ -11,15 +11,15 @@ type TimeSeriesDatabaseConnectionOperationPredicate struct {
 
 func (p TimeSeriesDatabaseConnectionOperationPredicate) Matches(input TimeSeriesDatabaseConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/digitaltwins/2023-01-31/digitaltwinsinstance/predicates.go b/resource-manager/digitaltwins/2023-01-31/digitaltwinsinstance/predicates.go
index be50bb940f7..7b79cd09737 100644
--- a/resource-manager/digitaltwins/2023-01-31/digitaltwinsinstance/predicates.go
+++ b/resource-manager/digitaltwins/2023-01-31/digitaltwinsinstance/predicates.go
@@ -12,7 +12,7 @@ type DigitalTwinsDescriptionOperationPredicate struct {
 
 func (p DigitalTwinsDescriptionOperationPredicate) Matches(input DigitalTwinsDescription) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p DigitalTwinsDescriptionOperationPredicate) Matches(input DigitalTwinsDes
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/digitaltwins/2023-01-31/endpoints/predicates.go b/resource-manager/digitaltwins/2023-01-31/endpoints/predicates.go
index 2a4339e68b0..97d55d1bf2a 100644
--- a/resource-manager/digitaltwins/2023-01-31/endpoints/predicates.go
+++ b/resource-manager/digitaltwins/2023-01-31/endpoints/predicates.go
@@ -11,15 +11,15 @@ type DigitalTwinsEndpointResourceOperationPredicate struct {
 
 func (p DigitalTwinsEndpointResourceOperationPredicate) Matches(input DigitalTwinsEndpointResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/digitaltwins/2023-01-31/timeseriesdatabaseconnections/predicates.go b/resource-manager/digitaltwins/2023-01-31/timeseriesdatabaseconnections/predicates.go
index 1669ddb53ef..024bf364426 100644
--- a/resource-manager/digitaltwins/2023-01-31/timeseriesdatabaseconnections/predicates.go
+++ b/resource-manager/digitaltwins/2023-01-31/timeseriesdatabaseconnections/predicates.go
@@ -11,15 +11,15 @@ type TimeSeriesDatabaseConnectionOperationPredicate struct {
 
 func (p TimeSeriesDatabaseConnectionOperationPredicate) Matches(input TimeSeriesDatabaseConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dns/2018-05-01/recordsets/predicates.go b/resource-manager/dns/2018-05-01/recordsets/predicates.go
index 3b614565bd9..d8c25e0e1ba 100644
--- a/resource-manager/dns/2018-05-01/recordsets/predicates.go
+++ b/resource-manager/dns/2018-05-01/recordsets/predicates.go
@@ -12,19 +12,19 @@ type RecordSetOperationPredicate struct {
 
 func (p RecordSetOperationPredicate) Matches(input RecordSet) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dns/2018-05-01/zones/predicates.go b/resource-manager/dns/2018-05-01/zones/predicates.go
index 24cd6e6204f..cf1481741f8 100644
--- a/resource-manager/dns/2018-05-01/zones/predicates.go
+++ b/resource-manager/dns/2018-05-01/zones/predicates.go
@@ -13,11 +13,11 @@ type ZoneOperationPredicate struct {
 
 func (p ZoneOperationPredicate) Matches(input Zone) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p ZoneOperationPredicate) Matches(input Zone) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dnsresolver/2022-07-01/dnsforwardingrulesets/predicates.go b/resource-manager/dnsresolver/2022-07-01/dnsforwardingrulesets/predicates.go
index b58a9e8fa7b..c52c3230e2a 100644
--- a/resource-manager/dnsresolver/2022-07-01/dnsforwardingrulesets/predicates.go
+++ b/resource-manager/dnsresolver/2022-07-01/dnsforwardingrulesets/predicates.go
@@ -13,11 +13,11 @@ type DnsForwardingRulesetOperationPredicate struct {
 
 func (p DnsForwardingRulesetOperationPredicate) Matches(input DnsForwardingRuleset) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p DnsForwardingRulesetOperationPredicate) Matches(input DnsForwardingRules
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -42,7 +42,7 @@ type VirtualNetworkDnsForwardingRulesetOperationPredicate struct {
 
 func (p VirtualNetworkDnsForwardingRulesetOperationPredicate) Matches(input VirtualNetworkDnsForwardingRuleset) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
diff --git a/resource-manager/dnsresolver/2022-07-01/dnsresolvers/predicates.go b/resource-manager/dnsresolver/2022-07-01/dnsresolvers/predicates.go
index e3bcf67cf36..f0c5d490d4a 100644
--- a/resource-manager/dnsresolver/2022-07-01/dnsresolvers/predicates.go
+++ b/resource-manager/dnsresolver/2022-07-01/dnsresolvers/predicates.go
@@ -13,11 +13,11 @@ type DnsResolverOperationPredicate struct {
 
 func (p DnsResolverOperationPredicate) Matches(input DnsResolver) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p DnsResolverOperationPredicate) Matches(input DnsResolver) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dnsresolver/2022-07-01/forwardingrules/predicates.go b/resource-manager/dnsresolver/2022-07-01/forwardingrules/predicates.go
index d249ddf0aed..c1794ef5359 100644
--- a/resource-manager/dnsresolver/2022-07-01/forwardingrules/predicates.go
+++ b/resource-manager/dnsresolver/2022-07-01/forwardingrules/predicates.go
@@ -12,19 +12,19 @@ type ForwardingRuleOperationPredicate struct {
 
 func (p ForwardingRuleOperationPredicate) Matches(input ForwardingRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dnsresolver/2022-07-01/inboundendpoints/predicates.go b/resource-manager/dnsresolver/2022-07-01/inboundendpoints/predicates.go
index 654f6491ed7..4bd041dcfa9 100644
--- a/resource-manager/dnsresolver/2022-07-01/inboundendpoints/predicates.go
+++ b/resource-manager/dnsresolver/2022-07-01/inboundendpoints/predicates.go
@@ -13,11 +13,11 @@ type InboundEndpointOperationPredicate struct {
 
 func (p InboundEndpointOperationPredicate) Matches(input InboundEndpoint) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p InboundEndpointOperationPredicate) Matches(input InboundEndpoint) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dnsresolver/2022-07-01/outboundendpoints/predicates.go b/resource-manager/dnsresolver/2022-07-01/outboundendpoints/predicates.go
index ea09cc3fc76..f9428b845c9 100644
--- a/resource-manager/dnsresolver/2022-07-01/outboundendpoints/predicates.go
+++ b/resource-manager/dnsresolver/2022-07-01/outboundendpoints/predicates.go
@@ -13,11 +13,11 @@ type OutboundEndpointOperationPredicate struct {
 
 func (p OutboundEndpointOperationPredicate) Matches(input OutboundEndpoint) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p OutboundEndpointOperationPredicate) Matches(input OutboundEndpoint) bool
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dnsresolver/2022-07-01/virtualnetworklinks/predicates.go b/resource-manager/dnsresolver/2022-07-01/virtualnetworklinks/predicates.go
index 459e3f8f30d..9f22eebd2ac 100644
--- a/resource-manager/dnsresolver/2022-07-01/virtualnetworklinks/predicates.go
+++ b/resource-manager/dnsresolver/2022-07-01/virtualnetworklinks/predicates.go
@@ -12,19 +12,19 @@ type VirtualNetworkLinkOperationPredicate struct {
 
 func (p VirtualNetworkLinkOperationPredicate) Matches(input VirtualNetworkLink) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dynatrace/2021-09-01/monitors/predicates.go b/resource-manager/dynatrace/2021-09-01/monitors/predicates.go
index 654b4b5742c..0f71e7af6b1 100644
--- a/resource-manager/dynatrace/2021-09-01/monitors/predicates.go
+++ b/resource-manager/dynatrace/2021-09-01/monitors/predicates.go
@@ -12,19 +12,19 @@ type AppServiceInfoOperationPredicate struct {
 
 func (p AppServiceInfoOperationPredicate) Matches(input AppServiceInfo) bool {
 
-	if p.HostGroup != nil && (input.HostGroup == nil && *p.HostGroup != *input.HostGroup) {
+	if p.HostGroup != nil && (input.HostGroup == nil || *p.HostGroup != *input.HostGroup) {
 		return false
 	}
 
-	if p.HostName != nil && (input.HostName == nil && *p.HostName != *input.HostName) {
+	if p.HostName != nil && (input.HostName == nil || *p.HostName != *input.HostName) {
 		return false
 	}
 
-	if p.ResourceId != nil && (input.ResourceId == nil && *p.ResourceId != *input.ResourceId) {
+	if p.ResourceId != nil && (input.ResourceId == nil || *p.ResourceId != *input.ResourceId) {
 		return false
 	}
 
-	if p.Version != nil && (input.Version == nil && *p.Version != *input.Version) {
+	if p.Version != nil && (input.Version == nil || *p.Version != *input.Version) {
 		return false
 	}
 
@@ -38,11 +38,11 @@ type LinkableEnvironmentResponseOperationPredicate struct {
 
 func (p LinkableEnvironmentResponseOperationPredicate) Matches(input LinkableEnvironmentResponse) bool {
 
-	if p.EnvironmentId != nil && (input.EnvironmentId == nil && *p.EnvironmentId != *input.EnvironmentId) {
+	if p.EnvironmentId != nil && (input.EnvironmentId == nil || *p.EnvironmentId != *input.EnvironmentId) {
 		return false
 	}
 
-	if p.EnvironmentName != nil && (input.EnvironmentName == nil && *p.EnvironmentName != *input.EnvironmentName) {
+	if p.EnvironmentName != nil && (input.EnvironmentName == nil || *p.EnvironmentName != *input.EnvironmentName) {
 		return false
 	}
 
@@ -58,7 +58,7 @@ type MonitorResourceOperationPredicate struct {
 
 func (p MonitorResourceOperationPredicate) Matches(input MonitorResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -66,11 +66,11 @@ func (p MonitorResourceOperationPredicate) Matches(input MonitorResource) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -85,15 +85,15 @@ type MonitoredResourceOperationPredicate struct {
 
 func (p MonitoredResourceOperationPredicate) Matches(input MonitoredResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.ReasonForLogsStatus != nil && (input.ReasonForLogsStatus == nil && *p.ReasonForLogsStatus != *input.ReasonForLogsStatus) {
+	if p.ReasonForLogsStatus != nil && (input.ReasonForLogsStatus == nil || *p.ReasonForLogsStatus != *input.ReasonForLogsStatus) {
 		return false
 	}
 
-	if p.ReasonForMetricsStatus != nil && (input.ReasonForMetricsStatus == nil && *p.ReasonForMetricsStatus != *input.ReasonForMetricsStatus) {
+	if p.ReasonForMetricsStatus != nil && (input.ReasonForMetricsStatus == nil || *p.ReasonForMetricsStatus != *input.ReasonForMetricsStatus) {
 		return false
 	}
 
@@ -109,19 +109,19 @@ type VMInfoOperationPredicate struct {
 
 func (p VMInfoOperationPredicate) Matches(input VMInfo) bool {
 
-	if p.HostGroup != nil && (input.HostGroup == nil && *p.HostGroup != *input.HostGroup) {
+	if p.HostGroup != nil && (input.HostGroup == nil || *p.HostGroup != *input.HostGroup) {
 		return false
 	}
 
-	if p.HostName != nil && (input.HostName == nil && *p.HostName != *input.HostName) {
+	if p.HostName != nil && (input.HostName == nil || *p.HostName != *input.HostName) {
 		return false
 	}
 
-	if p.ResourceId != nil && (input.ResourceId == nil && *p.ResourceId != *input.ResourceId) {
+	if p.ResourceId != nil && (input.ResourceId == nil || *p.ResourceId != *input.ResourceId) {
 		return false
 	}
 
-	if p.Version != nil && (input.Version == nil && *p.Version != *input.Version) {
+	if p.Version != nil && (input.Version == nil || *p.Version != *input.Version) {
 		return false
 	}
 
diff --git a/resource-manager/dynatrace/2021-09-01/singlesignon/predicates.go b/resource-manager/dynatrace/2021-09-01/singlesignon/predicates.go
index cd3e0b7afd9..fafb14bff29 100644
--- a/resource-manager/dynatrace/2021-09-01/singlesignon/predicates.go
+++ b/resource-manager/dynatrace/2021-09-01/singlesignon/predicates.go
@@ -11,15 +11,15 @@ type DynatraceSingleSignOnResourceOperationPredicate struct {
 
 func (p DynatraceSingleSignOnResourceOperationPredicate) Matches(input DynatraceSingleSignOnResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dynatrace/2021-09-01/tagrules/predicates.go b/resource-manager/dynatrace/2021-09-01/tagrules/predicates.go
index 0d3e21a1382..b8e7c533c9f 100644
--- a/resource-manager/dynatrace/2021-09-01/tagrules/predicates.go
+++ b/resource-manager/dynatrace/2021-09-01/tagrules/predicates.go
@@ -11,15 +11,15 @@ type TagRuleOperationPredicate struct {
 
 func (p TagRuleOperationPredicate) Matches(input TagRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dynatrace/2023-04-27/monitors/predicates.go b/resource-manager/dynatrace/2023-04-27/monitors/predicates.go
index 654b4b5742c..0f71e7af6b1 100644
--- a/resource-manager/dynatrace/2023-04-27/monitors/predicates.go
+++ b/resource-manager/dynatrace/2023-04-27/monitors/predicates.go
@@ -12,19 +12,19 @@ type AppServiceInfoOperationPredicate struct {
 
 func (p AppServiceInfoOperationPredicate) Matches(input AppServiceInfo) bool {
 
-	if p.HostGroup != nil && (input.HostGroup == nil && *p.HostGroup != *input.HostGroup) {
+	if p.HostGroup != nil && (input.HostGroup == nil || *p.HostGroup != *input.HostGroup) {
 		return false
 	}
 
-	if p.HostName != nil && (input.HostName == nil && *p.HostName != *input.HostName) {
+	if p.HostName != nil && (input.HostName == nil || *p.HostName != *input.HostName) {
 		return false
 	}
 
-	if p.ResourceId != nil && (input.ResourceId == nil && *p.ResourceId != *input.ResourceId) {
+	if p.ResourceId != nil && (input.ResourceId == nil || *p.ResourceId != *input.ResourceId) {
 		return false
 	}
 
-	if p.Version != nil && (input.Version == nil && *p.Version != *input.Version) {
+	if p.Version != nil && (input.Version == nil || *p.Version != *input.Version) {
 		return false
 	}
 
@@ -38,11 +38,11 @@ type LinkableEnvironmentResponseOperationPredicate struct {
 
 func (p LinkableEnvironmentResponseOperationPredicate) Matches(input LinkableEnvironmentResponse) bool {
 
-	if p.EnvironmentId != nil && (input.EnvironmentId == nil && *p.EnvironmentId != *input.EnvironmentId) {
+	if p.EnvironmentId != nil && (input.EnvironmentId == nil || *p.EnvironmentId != *input.EnvironmentId) {
 		return false
 	}
 
-	if p.EnvironmentName != nil && (input.EnvironmentName == nil && *p.EnvironmentName != *input.EnvironmentName) {
+	if p.EnvironmentName != nil && (input.EnvironmentName == nil || *p.EnvironmentName != *input.EnvironmentName) {
 		return false
 	}
 
@@ -58,7 +58,7 @@ type MonitorResourceOperationPredicate struct {
 
 func (p MonitorResourceOperationPredicate) Matches(input MonitorResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -66,11 +66,11 @@ func (p MonitorResourceOperationPredicate) Matches(input MonitorResource) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -85,15 +85,15 @@ type MonitoredResourceOperationPredicate struct {
 
 func (p MonitoredResourceOperationPredicate) Matches(input MonitoredResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.ReasonForLogsStatus != nil && (input.ReasonForLogsStatus == nil && *p.ReasonForLogsStatus != *input.ReasonForLogsStatus) {
+	if p.ReasonForLogsStatus != nil && (input.ReasonForLogsStatus == nil || *p.ReasonForLogsStatus != *input.ReasonForLogsStatus) {
 		return false
 	}
 
-	if p.ReasonForMetricsStatus != nil && (input.ReasonForMetricsStatus == nil && *p.ReasonForMetricsStatus != *input.ReasonForMetricsStatus) {
+	if p.ReasonForMetricsStatus != nil && (input.ReasonForMetricsStatus == nil || *p.ReasonForMetricsStatus != *input.ReasonForMetricsStatus) {
 		return false
 	}
 
@@ -109,19 +109,19 @@ type VMInfoOperationPredicate struct {
 
 func (p VMInfoOperationPredicate) Matches(input VMInfo) bool {
 
-	if p.HostGroup != nil && (input.HostGroup == nil && *p.HostGroup != *input.HostGroup) {
+	if p.HostGroup != nil && (input.HostGroup == nil || *p.HostGroup != *input.HostGroup) {
 		return false
 	}
 
-	if p.HostName != nil && (input.HostName == nil && *p.HostName != *input.HostName) {
+	if p.HostName != nil && (input.HostName == nil || *p.HostName != *input.HostName) {
 		return false
 	}
 
-	if p.ResourceId != nil && (input.ResourceId == nil && *p.ResourceId != *input.ResourceId) {
+	if p.ResourceId != nil && (input.ResourceId == nil || *p.ResourceId != *input.ResourceId) {
 		return false
 	}
 
-	if p.Version != nil && (input.Version == nil && *p.Version != *input.Version) {
+	if p.Version != nil && (input.Version == nil || *p.Version != *input.Version) {
 		return false
 	}
 
diff --git a/resource-manager/dynatrace/2023-04-27/singlesignon/predicates.go b/resource-manager/dynatrace/2023-04-27/singlesignon/predicates.go
index cd3e0b7afd9..fafb14bff29 100644
--- a/resource-manager/dynatrace/2023-04-27/singlesignon/predicates.go
+++ b/resource-manager/dynatrace/2023-04-27/singlesignon/predicates.go
@@ -11,15 +11,15 @@ type DynatraceSingleSignOnResourceOperationPredicate struct {
 
 func (p DynatraceSingleSignOnResourceOperationPredicate) Matches(input DynatraceSingleSignOnResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/dynatrace/2023-04-27/tagrules/predicates.go b/resource-manager/dynatrace/2023-04-27/tagrules/predicates.go
index 0d3e21a1382..b8e7c533c9f 100644
--- a/resource-manager/dynatrace/2023-04-27/tagrules/predicates.go
+++ b/resource-manager/dynatrace/2023-04-27/tagrules/predicates.go
@@ -11,15 +11,15 @@ type TagRuleOperationPredicate struct {
 
 func (p TagRuleOperationPredicate) Matches(input TagRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/elastic/2023-06-01/monitoredresources/predicates.go b/resource-manager/elastic/2023-06-01/monitoredresources/predicates.go
index 94481b937e4..a17892f2418 100644
--- a/resource-manager/elastic/2023-06-01/monitoredresources/predicates.go
+++ b/resource-manager/elastic/2023-06-01/monitoredresources/predicates.go
@@ -10,11 +10,11 @@ type MonitoredResourceOperationPredicate struct {
 
 func (p MonitoredResourceOperationPredicate) Matches(input MonitoredResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.ReasonForLogsStatus != nil && (input.ReasonForLogsStatus == nil && *p.ReasonForLogsStatus != *input.ReasonForLogsStatus) {
+	if p.ReasonForLogsStatus != nil && (input.ReasonForLogsStatus == nil || *p.ReasonForLogsStatus != *input.ReasonForLogsStatus) {
 		return false
 	}
 
diff --git a/resource-manager/elastic/2023-06-01/monitorsresource/predicates.go b/resource-manager/elastic/2023-06-01/monitorsresource/predicates.go
index 5bd43b38415..35f434ad801 100644
--- a/resource-manager/elastic/2023-06-01/monitorsresource/predicates.go
+++ b/resource-manager/elastic/2023-06-01/monitorsresource/predicates.go
@@ -12,7 +12,7 @@ type ElasticMonitorResourceOperationPredicate struct {
 
 func (p ElasticMonitorResourceOperationPredicate) Matches(input ElasticMonitorResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ElasticMonitorResourceOperationPredicate) Matches(input ElasticMonitorRe
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/elastic/2023-06-01/rules/predicates.go b/resource-manager/elastic/2023-06-01/rules/predicates.go
index 78f6bbd6457..8052394d262 100644
--- a/resource-manager/elastic/2023-06-01/rules/predicates.go
+++ b/resource-manager/elastic/2023-06-01/rules/predicates.go
@@ -11,15 +11,15 @@ type MonitoringTagRulesOperationPredicate struct {
 
 func (p MonitoringTagRulesOperationPredicate) Matches(input MonitoringTagRules) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/elastic/2023-06-01/vmhhostlist/predicates.go b/resource-manager/elastic/2023-06-01/vmhhostlist/predicates.go
index 1d59d1943f9..e4f8073c70a 100644
--- a/resource-manager/elastic/2023-06-01/vmhhostlist/predicates.go
+++ b/resource-manager/elastic/2023-06-01/vmhhostlist/predicates.go
@@ -9,7 +9,7 @@ type VMResourcesOperationPredicate struct {
 
 func (p VMResourcesOperationPredicate) Matches(input VMResources) bool {
 
-	if p.VMResourceId != nil && (input.VMResourceId == nil && *p.VMResourceId != *input.VMResourceId) {
+	if p.VMResourceId != nil && (input.VMResourceId == nil || *p.VMResourceId != *input.VMResourceId) {
 		return false
 	}
 
diff --git a/resource-manager/elasticsan/2021-11-20-preview/elasticsan/predicates.go b/resource-manager/elasticsan/2021-11-20-preview/elasticsan/predicates.go
index e3bc9d5ef16..50803be3b92 100644
--- a/resource-manager/elasticsan/2021-11-20-preview/elasticsan/predicates.go
+++ b/resource-manager/elasticsan/2021-11-20-preview/elasticsan/predicates.go
@@ -12,19 +12,19 @@ type ElasticSanOperationPredicate struct {
 
 func (p ElasticSanOperationPredicate) Matches(input ElasticSan) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/elasticsan/2021-11-20-preview/elasticsans/predicates.go b/resource-manager/elasticsan/2021-11-20-preview/elasticsans/predicates.go
index a8095e7289f..1eaedfd4c09 100644
--- a/resource-manager/elasticsan/2021-11-20-preview/elasticsans/predicates.go
+++ b/resource-manager/elasticsan/2021-11-20-preview/elasticsans/predicates.go
@@ -12,19 +12,19 @@ type ElasticSanOperationPredicate struct {
 
 func (p ElasticSanOperationPredicate) Matches(input ElasticSan) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/elasticsan/2021-11-20-preview/volumegroups/predicates.go b/resource-manager/elasticsan/2021-11-20-preview/volumegroups/predicates.go
index 4f3eb4b47a6..96fba1a555c 100644
--- a/resource-manager/elasticsan/2021-11-20-preview/volumegroups/predicates.go
+++ b/resource-manager/elasticsan/2021-11-20-preview/volumegroups/predicates.go
@@ -11,15 +11,15 @@ type VolumeGroupOperationPredicate struct {
 
 func (p VolumeGroupOperationPredicate) Matches(input VolumeGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/elasticsan/2021-11-20-preview/volumes/predicates.go b/resource-manager/elasticsan/2021-11-20-preview/volumes/predicates.go
index b8130271c43..bae7b80f428 100644
--- a/resource-manager/elasticsan/2021-11-20-preview/volumes/predicates.go
+++ b/resource-manager/elasticsan/2021-11-20-preview/volumes/predicates.go
@@ -11,15 +11,15 @@ type VolumeOperationPredicate struct {
 
 func (p VolumeOperationPredicate) Matches(input Volume) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventgrid/2022-06-15/channels/predicates.go b/resource-manager/eventgrid/2022-06-15/channels/predicates.go
index 1a81be362d3..4fe41cded7f 100644
--- a/resource-manager/eventgrid/2022-06-15/channels/predicates.go
+++ b/resource-manager/eventgrid/2022-06-15/channels/predicates.go
@@ -11,15 +11,15 @@ type ChannelOperationPredicate struct {
 
 func (p ChannelOperationPredicate) Matches(input Channel) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventgrid/2022-06-15/domains/predicates.go b/resource-manager/eventgrid/2022-06-15/domains/predicates.go
index dc0b145ffff..1e6a76ee099 100644
--- a/resource-manager/eventgrid/2022-06-15/domains/predicates.go
+++ b/resource-manager/eventgrid/2022-06-15/domains/predicates.go
@@ -12,7 +12,7 @@ type DomainOperationPredicate struct {
 
 func (p DomainOperationPredicate) Matches(input Domain) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p DomainOperationPredicate) Matches(input Domain) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventgrid/2022-06-15/domaintopics/predicates.go b/resource-manager/eventgrid/2022-06-15/domaintopics/predicates.go
index fdc82fc7ccb..3f34d344a23 100644
--- a/resource-manager/eventgrid/2022-06-15/domaintopics/predicates.go
+++ b/resource-manager/eventgrid/2022-06-15/domaintopics/predicates.go
@@ -11,15 +11,15 @@ type DomainTopicOperationPredicate struct {
 
 func (p DomainTopicOperationPredicate) Matches(input DomainTopic) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventgrid/2022-06-15/eventsubscriptions/predicates.go b/resource-manager/eventgrid/2022-06-15/eventsubscriptions/predicates.go
index 7599158893e..707eb1926d3 100644
--- a/resource-manager/eventgrid/2022-06-15/eventsubscriptions/predicates.go
+++ b/resource-manager/eventgrid/2022-06-15/eventsubscriptions/predicates.go
@@ -11,15 +11,15 @@ type EventSubscriptionOperationPredicate struct {
 
 func (p EventSubscriptionOperationPredicate) Matches(input EventSubscription) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventgrid/2022-06-15/partnerconfigurations/predicates.go b/resource-manager/eventgrid/2022-06-15/partnerconfigurations/predicates.go
index 5baac4be149..2c6e9adda78 100644
--- a/resource-manager/eventgrid/2022-06-15/partnerconfigurations/predicates.go
+++ b/resource-manager/eventgrid/2022-06-15/partnerconfigurations/predicates.go
@@ -12,19 +12,19 @@ type PartnerConfigurationOperationPredicate struct {
 
 func (p PartnerConfigurationOperationPredicate) Matches(input PartnerConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventgrid/2022-06-15/partnernamespaces/predicates.go b/resource-manager/eventgrid/2022-06-15/partnernamespaces/predicates.go
index b3a3c510ce6..9cc1daca56b 100644
--- a/resource-manager/eventgrid/2022-06-15/partnernamespaces/predicates.go
+++ b/resource-manager/eventgrid/2022-06-15/partnernamespaces/predicates.go
@@ -12,7 +12,7 @@ type PartnerNamespaceOperationPredicate struct {
 
 func (p PartnerNamespaceOperationPredicate) Matches(input PartnerNamespace) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p PartnerNamespaceOperationPredicate) Matches(input PartnerNamespace) bool
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventgrid/2022-06-15/partnerregistrations/predicates.go b/resource-manager/eventgrid/2022-06-15/partnerregistrations/predicates.go
index cf7588b4471..f3faf094ded 100644
--- a/resource-manager/eventgrid/2022-06-15/partnerregistrations/predicates.go
+++ b/resource-manager/eventgrid/2022-06-15/partnerregistrations/predicates.go
@@ -12,7 +12,7 @@ type PartnerRegistrationOperationPredicate struct {
 
 func (p PartnerRegistrationOperationPredicate) Matches(input PartnerRegistration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p PartnerRegistrationOperationPredicate) Matches(input PartnerRegistration
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventgrid/2022-06-15/partnertopics/predicates.go b/resource-manager/eventgrid/2022-06-15/partnertopics/predicates.go
index fef4b34cfe0..5659c12644b 100644
--- a/resource-manager/eventgrid/2022-06-15/partnertopics/predicates.go
+++ b/resource-manager/eventgrid/2022-06-15/partnertopics/predicates.go
@@ -12,7 +12,7 @@ type PartnerTopicOperationPredicate struct {
 
 func (p PartnerTopicOperationPredicate) Matches(input PartnerTopic) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p PartnerTopicOperationPredicate) Matches(input PartnerTopic) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventgrid/2022-06-15/privateendpointconnections/predicates.go b/resource-manager/eventgrid/2022-06-15/privateendpointconnections/predicates.go
index bea3f66b397..4a03a91ce52 100644
--- a/resource-manager/eventgrid/2022-06-15/privateendpointconnections/predicates.go
+++ b/resource-manager/eventgrid/2022-06-15/privateendpointconnections/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventgrid/2022-06-15/privatelinkresources/predicates.go b/resource-manager/eventgrid/2022-06-15/privatelinkresources/predicates.go
index 29d787f073a..19b771c3994 100644
--- a/resource-manager/eventgrid/2022-06-15/privatelinkresources/predicates.go
+++ b/resource-manager/eventgrid/2022-06-15/privatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventgrid/2022-06-15/systemtopics/predicates.go b/resource-manager/eventgrid/2022-06-15/systemtopics/predicates.go
index 234b4cbf834..eb50601c4f2 100644
--- a/resource-manager/eventgrid/2022-06-15/systemtopics/predicates.go
+++ b/resource-manager/eventgrid/2022-06-15/systemtopics/predicates.go
@@ -12,7 +12,7 @@ type SystemTopicOperationPredicate struct {
 
 func (p SystemTopicOperationPredicate) Matches(input SystemTopic) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SystemTopicOperationPredicate) Matches(input SystemTopic) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventgrid/2022-06-15/topics/predicates.go b/resource-manager/eventgrid/2022-06-15/topics/predicates.go
index cc01dd3a532..da916d64e3d 100644
--- a/resource-manager/eventgrid/2022-06-15/topics/predicates.go
+++ b/resource-manager/eventgrid/2022-06-15/topics/predicates.go
@@ -12,7 +12,7 @@ type TopicOperationPredicate struct {
 
 func (p TopicOperationPredicate) Matches(input Topic) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p TopicOperationPredicate) Matches(input Topic) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventgrid/2022-06-15/verifiedpartners/predicates.go b/resource-manager/eventgrid/2022-06-15/verifiedpartners/predicates.go
index df0a206a872..f2d25160cbb 100644
--- a/resource-manager/eventgrid/2022-06-15/verifiedpartners/predicates.go
+++ b/resource-manager/eventgrid/2022-06-15/verifiedpartners/predicates.go
@@ -11,15 +11,15 @@ type VerifiedPartnerOperationPredicate struct {
 
 func (p VerifiedPartnerOperationPredicate) Matches(input VerifiedPartner) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventhub/2021-11-01/authorizationrulesdisasterrecoveryconfigs/predicates.go b/resource-manager/eventhub/2021-11-01/authorizationrulesdisasterrecoveryconfigs/predicates.go
index deff7a5562d..0e7748637f6 100644
--- a/resource-manager/eventhub/2021-11-01/authorizationrulesdisasterrecoveryconfigs/predicates.go
+++ b/resource-manager/eventhub/2021-11-01/authorizationrulesdisasterrecoveryconfigs/predicates.go
@@ -12,19 +12,19 @@ type AuthorizationRuleOperationPredicate struct {
 
 func (p AuthorizationRuleOperationPredicate) Matches(input AuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventhub/2021-11-01/authorizationruleseventhubs/predicates.go b/resource-manager/eventhub/2021-11-01/authorizationruleseventhubs/predicates.go
index fd0887b530d..71fac44d375 100644
--- a/resource-manager/eventhub/2021-11-01/authorizationruleseventhubs/predicates.go
+++ b/resource-manager/eventhub/2021-11-01/authorizationruleseventhubs/predicates.go
@@ -12,19 +12,19 @@ type AuthorizationRuleOperationPredicate struct {
 
 func (p AuthorizationRuleOperationPredicate) Matches(input AuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventhub/2021-11-01/authorizationrulesnamespaces/predicates.go b/resource-manager/eventhub/2021-11-01/authorizationrulesnamespaces/predicates.go
index c0acd19e15e..fd9c16331de 100644
--- a/resource-manager/eventhub/2021-11-01/authorizationrulesnamespaces/predicates.go
+++ b/resource-manager/eventhub/2021-11-01/authorizationrulesnamespaces/predicates.go
@@ -12,19 +12,19 @@ type AuthorizationRuleOperationPredicate struct {
 
 func (p AuthorizationRuleOperationPredicate) Matches(input AuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventhub/2021-11-01/consumergroups/predicates.go b/resource-manager/eventhub/2021-11-01/consumergroups/predicates.go
index ef770825faa..e1e46209a6f 100644
--- a/resource-manager/eventhub/2021-11-01/consumergroups/predicates.go
+++ b/resource-manager/eventhub/2021-11-01/consumergroups/predicates.go
@@ -12,19 +12,19 @@ type ConsumerGroupOperationPredicate struct {
 
 func (p ConsumerGroupOperationPredicate) Matches(input ConsumerGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventhub/2021-11-01/disasterrecoveryconfigs/predicates.go b/resource-manager/eventhub/2021-11-01/disasterrecoveryconfigs/predicates.go
index 6bbbf839535..32132ce215e 100644
--- a/resource-manager/eventhub/2021-11-01/disasterrecoveryconfigs/predicates.go
+++ b/resource-manager/eventhub/2021-11-01/disasterrecoveryconfigs/predicates.go
@@ -12,19 +12,19 @@ type ArmDisasterRecoveryOperationPredicate struct {
 
 func (p ArmDisasterRecoveryOperationPredicate) Matches(input ArmDisasterRecovery) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventhub/2021-11-01/eventhubs/predicates.go b/resource-manager/eventhub/2021-11-01/eventhubs/predicates.go
index 54e02b4f9ed..2b20e7d85e0 100644
--- a/resource-manager/eventhub/2021-11-01/eventhubs/predicates.go
+++ b/resource-manager/eventhub/2021-11-01/eventhubs/predicates.go
@@ -12,19 +12,19 @@ type EventhubOperationPredicate struct {
 
 func (p EventhubOperationPredicate) Matches(input Eventhub) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventhub/2021-11-01/eventhubsclusters/predicates.go b/resource-manager/eventhub/2021-11-01/eventhubsclusters/predicates.go
index f967fc3461a..3b8486533db 100644
--- a/resource-manager/eventhub/2021-11-01/eventhubsclusters/predicates.go
+++ b/resource-manager/eventhub/2021-11-01/eventhubsclusters/predicates.go
@@ -12,19 +12,19 @@ type ClusterOperationPredicate struct {
 
 func (p ClusterOperationPredicate) Matches(input Cluster) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventhub/2021-11-01/namespaces/predicates.go b/resource-manager/eventhub/2021-11-01/namespaces/predicates.go
index a6c608b6d18..5ca537e45d2 100644
--- a/resource-manager/eventhub/2021-11-01/namespaces/predicates.go
+++ b/resource-manager/eventhub/2021-11-01/namespaces/predicates.go
@@ -12,19 +12,19 @@ type EHNamespaceOperationPredicate struct {
 
 func (p EHNamespaceOperationPredicate) Matches(input EHNamespace) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventhub/2021-11-01/namespacesprivateendpointconnections/predicates.go b/resource-manager/eventhub/2021-11-01/namespacesprivateendpointconnections/predicates.go
index 5a8a3fa3b56..f1b8f930ec1 100644
--- a/resource-manager/eventhub/2021-11-01/namespacesprivateendpointconnections/predicates.go
+++ b/resource-manager/eventhub/2021-11-01/namespacesprivateendpointconnections/predicates.go
@@ -12,19 +12,19 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventhub/2021-11-01/schemaregistry/predicates.go b/resource-manager/eventhub/2021-11-01/schemaregistry/predicates.go
index 301d7b0e301..4cf505ed009 100644
--- a/resource-manager/eventhub/2021-11-01/schemaregistry/predicates.go
+++ b/resource-manager/eventhub/2021-11-01/schemaregistry/predicates.go
@@ -12,19 +12,19 @@ type SchemaGroupOperationPredicate struct {
 
 func (p SchemaGroupOperationPredicate) Matches(input SchemaGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventhub/2022-01-01-preview/applicationgroup/predicates.go b/resource-manager/eventhub/2022-01-01-preview/applicationgroup/predicates.go
index 4e5364e1f2b..6e46ec39176 100644
--- a/resource-manager/eventhub/2022-01-01-preview/applicationgroup/predicates.go
+++ b/resource-manager/eventhub/2022-01-01-preview/applicationgroup/predicates.go
@@ -12,19 +12,19 @@ type ApplicationGroupOperationPredicate struct {
 
 func (p ApplicationGroupOperationPredicate) Matches(input ApplicationGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventhub/2022-01-01-preview/authorizationrulesdisasterrecoveryconfigs/predicates.go b/resource-manager/eventhub/2022-01-01-preview/authorizationrulesdisasterrecoveryconfigs/predicates.go
index deff7a5562d..0e7748637f6 100644
--- a/resource-manager/eventhub/2022-01-01-preview/authorizationrulesdisasterrecoveryconfigs/predicates.go
+++ b/resource-manager/eventhub/2022-01-01-preview/authorizationrulesdisasterrecoveryconfigs/predicates.go
@@ -12,19 +12,19 @@ type AuthorizationRuleOperationPredicate struct {
 
 func (p AuthorizationRuleOperationPredicate) Matches(input AuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventhub/2022-01-01-preview/authorizationruleseventhubs/predicates.go b/resource-manager/eventhub/2022-01-01-preview/authorizationruleseventhubs/predicates.go
index fd0887b530d..71fac44d375 100644
--- a/resource-manager/eventhub/2022-01-01-preview/authorizationruleseventhubs/predicates.go
+++ b/resource-manager/eventhub/2022-01-01-preview/authorizationruleseventhubs/predicates.go
@@ -12,19 +12,19 @@ type AuthorizationRuleOperationPredicate struct {
 
 func (p AuthorizationRuleOperationPredicate) Matches(input AuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventhub/2022-01-01-preview/authorizationrulesnamespaces/predicates.go b/resource-manager/eventhub/2022-01-01-preview/authorizationrulesnamespaces/predicates.go
index c0acd19e15e..fd9c16331de 100644
--- a/resource-manager/eventhub/2022-01-01-preview/authorizationrulesnamespaces/predicates.go
+++ b/resource-manager/eventhub/2022-01-01-preview/authorizationrulesnamespaces/predicates.go
@@ -12,19 +12,19 @@ type AuthorizationRuleOperationPredicate struct {
 
 func (p AuthorizationRuleOperationPredicate) Matches(input AuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventhub/2022-01-01-preview/consumergroups/predicates.go b/resource-manager/eventhub/2022-01-01-preview/consumergroups/predicates.go
index ef770825faa..e1e46209a6f 100644
--- a/resource-manager/eventhub/2022-01-01-preview/consumergroups/predicates.go
+++ b/resource-manager/eventhub/2022-01-01-preview/consumergroups/predicates.go
@@ -12,19 +12,19 @@ type ConsumerGroupOperationPredicate struct {
 
 func (p ConsumerGroupOperationPredicate) Matches(input ConsumerGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventhub/2022-01-01-preview/disasterrecoveryconfigs/predicates.go b/resource-manager/eventhub/2022-01-01-preview/disasterrecoveryconfigs/predicates.go
index 6bbbf839535..32132ce215e 100644
--- a/resource-manager/eventhub/2022-01-01-preview/disasterrecoveryconfigs/predicates.go
+++ b/resource-manager/eventhub/2022-01-01-preview/disasterrecoveryconfigs/predicates.go
@@ -12,19 +12,19 @@ type ArmDisasterRecoveryOperationPredicate struct {
 
 func (p ArmDisasterRecoveryOperationPredicate) Matches(input ArmDisasterRecovery) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventhub/2022-01-01-preview/eventhubs/predicates.go b/resource-manager/eventhub/2022-01-01-preview/eventhubs/predicates.go
index 54e02b4f9ed..2b20e7d85e0 100644
--- a/resource-manager/eventhub/2022-01-01-preview/eventhubs/predicates.go
+++ b/resource-manager/eventhub/2022-01-01-preview/eventhubs/predicates.go
@@ -12,19 +12,19 @@ type EventhubOperationPredicate struct {
 
 func (p EventhubOperationPredicate) Matches(input Eventhub) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventhub/2022-01-01-preview/eventhubsclusters/predicates.go b/resource-manager/eventhub/2022-01-01-preview/eventhubsclusters/predicates.go
index f967fc3461a..3b8486533db 100644
--- a/resource-manager/eventhub/2022-01-01-preview/eventhubsclusters/predicates.go
+++ b/resource-manager/eventhub/2022-01-01-preview/eventhubsclusters/predicates.go
@@ -12,19 +12,19 @@ type ClusterOperationPredicate struct {
 
 func (p ClusterOperationPredicate) Matches(input Cluster) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventhub/2022-01-01-preview/namespaces/predicates.go b/resource-manager/eventhub/2022-01-01-preview/namespaces/predicates.go
index a6c608b6d18..5ca537e45d2 100644
--- a/resource-manager/eventhub/2022-01-01-preview/namespaces/predicates.go
+++ b/resource-manager/eventhub/2022-01-01-preview/namespaces/predicates.go
@@ -12,19 +12,19 @@ type EHNamespaceOperationPredicate struct {
 
 func (p EHNamespaceOperationPredicate) Matches(input EHNamespace) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventhub/2022-01-01-preview/namespacesprivateendpointconnections/predicates.go b/resource-manager/eventhub/2022-01-01-preview/namespacesprivateendpointconnections/predicates.go
index 5a8a3fa3b56..f1b8f930ec1 100644
--- a/resource-manager/eventhub/2022-01-01-preview/namespacesprivateendpointconnections/predicates.go
+++ b/resource-manager/eventhub/2022-01-01-preview/namespacesprivateendpointconnections/predicates.go
@@ -12,19 +12,19 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/eventhub/2022-01-01-preview/schemaregistry/predicates.go b/resource-manager/eventhub/2022-01-01-preview/schemaregistry/predicates.go
index 301d7b0e301..4cf505ed009 100644
--- a/resource-manager/eventhub/2022-01-01-preview/schemaregistry/predicates.go
+++ b/resource-manager/eventhub/2022-01-01-preview/schemaregistry/predicates.go
@@ -12,19 +12,19 @@ type SchemaGroupOperationPredicate struct {
 
 func (p SchemaGroupOperationPredicate) Matches(input SchemaGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/extendedlocation/2021-08-15/customlocations/predicates.go b/resource-manager/extendedlocation/2021-08-15/customlocations/predicates.go
index 26531c24964..f18b5aa943f 100644
--- a/resource-manager/extendedlocation/2021-08-15/customlocations/predicates.go
+++ b/resource-manager/extendedlocation/2021-08-15/customlocations/predicates.go
@@ -12,7 +12,7 @@ type CustomLocationOperationPredicate struct {
 
 func (p CustomLocationOperationPredicate) Matches(input CustomLocation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p CustomLocationOperationPredicate) Matches(input CustomLocation) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -39,15 +39,15 @@ type EnabledResourceTypeOperationPredicate struct {
 
 func (p EnabledResourceTypeOperationPredicate) Matches(input EnabledResourceType) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/fluidrelay/2022-05-26/fluidrelaycontainers/predicates.go b/resource-manager/fluidrelay/2022-05-26/fluidrelaycontainers/predicates.go
index e823e219e6d..897af56f069 100644
--- a/resource-manager/fluidrelay/2022-05-26/fluidrelaycontainers/predicates.go
+++ b/resource-manager/fluidrelay/2022-05-26/fluidrelaycontainers/predicates.go
@@ -11,15 +11,15 @@ type FluidRelayContainerOperationPredicate struct {
 
 func (p FluidRelayContainerOperationPredicate) Matches(input FluidRelayContainer) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/fluidrelay/2022-05-26/fluidrelayservers/predicates.go b/resource-manager/fluidrelay/2022-05-26/fluidrelayservers/predicates.go
index 917eeb83bf1..371ddb300f4 100644
--- a/resource-manager/fluidrelay/2022-05-26/fluidrelayservers/predicates.go
+++ b/resource-manager/fluidrelay/2022-05-26/fluidrelayservers/predicates.go
@@ -12,7 +12,7 @@ type FluidRelayServerOperationPredicate struct {
 
 func (p FluidRelayServerOperationPredicate) Matches(input FluidRelayServer) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p FluidRelayServerOperationPredicate) Matches(input FluidRelayServer) bool
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/fluidrelay/2022-06-01/fluidrelaycontainers/predicates.go b/resource-manager/fluidrelay/2022-06-01/fluidrelaycontainers/predicates.go
index e823e219e6d..897af56f069 100644
--- a/resource-manager/fluidrelay/2022-06-01/fluidrelaycontainers/predicates.go
+++ b/resource-manager/fluidrelay/2022-06-01/fluidrelaycontainers/predicates.go
@@ -11,15 +11,15 @@ type FluidRelayContainerOperationPredicate struct {
 
 func (p FluidRelayContainerOperationPredicate) Matches(input FluidRelayContainer) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/fluidrelay/2022-06-01/fluidrelayservers/predicates.go b/resource-manager/fluidrelay/2022-06-01/fluidrelayservers/predicates.go
index 917eeb83bf1..371ddb300f4 100644
--- a/resource-manager/fluidrelay/2022-06-01/fluidrelayservers/predicates.go
+++ b/resource-manager/fluidrelay/2022-06-01/fluidrelayservers/predicates.go
@@ -12,7 +12,7 @@ type FluidRelayServerOperationPredicate struct {
 
 func (p FluidRelayServerOperationPredicate) Matches(input FluidRelayServer) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p FluidRelayServerOperationPredicate) Matches(input FluidRelayServer) bool
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/frontdoor/2020-04-01/frontdoors/predicates.go b/resource-manager/frontdoor/2020-04-01/frontdoors/predicates.go
index 99c7e856361..4cfd5063e1b 100644
--- a/resource-manager/frontdoor/2020-04-01/frontdoors/predicates.go
+++ b/resource-manager/frontdoor/2020-04-01/frontdoors/predicates.go
@@ -12,19 +12,19 @@ type FrontDoorOperationPredicate struct {
 
 func (p FrontDoorOperationPredicate) Matches(input FrontDoor) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -39,15 +39,15 @@ type FrontendEndpointOperationPredicate struct {
 
 func (p FrontendEndpointOperationPredicate) Matches(input FrontendEndpoint) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -62,15 +62,15 @@ type RulesEngineOperationPredicate struct {
 
 func (p RulesEngineOperationPredicate) Matches(input RulesEngine) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/frontdoor/2020-04-01/webapplicationfirewallmanagedrulesets/predicates.go b/resource-manager/frontdoor/2020-04-01/webapplicationfirewallmanagedrulesets/predicates.go
index 395a3b3c69b..1377bd339b0 100644
--- a/resource-manager/frontdoor/2020-04-01/webapplicationfirewallmanagedrulesets/predicates.go
+++ b/resource-manager/frontdoor/2020-04-01/webapplicationfirewallmanagedrulesets/predicates.go
@@ -12,19 +12,19 @@ type ManagedRuleSetDefinitionOperationPredicate struct {
 
 func (p ManagedRuleSetDefinitionOperationPredicate) Matches(input ManagedRuleSetDefinition) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/frontdoor/2020-04-01/webapplicationfirewallpolicies/predicates.go b/resource-manager/frontdoor/2020-04-01/webapplicationfirewallpolicies/predicates.go
index 9bdf8d1c8b6..a7973b0a14f 100644
--- a/resource-manager/frontdoor/2020-04-01/webapplicationfirewallpolicies/predicates.go
+++ b/resource-manager/frontdoor/2020-04-01/webapplicationfirewallpolicies/predicates.go
@@ -13,23 +13,23 @@ type WebApplicationFirewallPolicyOperationPredicate struct {
 
 func (p WebApplicationFirewallPolicyOperationPredicate) Matches(input WebApplicationFirewallPolicy) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/frontdoor/2020-05-01/frontdoors/predicates.go b/resource-manager/frontdoor/2020-05-01/frontdoors/predicates.go
index 99c7e856361..4cfd5063e1b 100644
--- a/resource-manager/frontdoor/2020-05-01/frontdoors/predicates.go
+++ b/resource-manager/frontdoor/2020-05-01/frontdoors/predicates.go
@@ -12,19 +12,19 @@ type FrontDoorOperationPredicate struct {
 
 func (p FrontDoorOperationPredicate) Matches(input FrontDoor) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -39,15 +39,15 @@ type FrontendEndpointOperationPredicate struct {
 
 func (p FrontendEndpointOperationPredicate) Matches(input FrontendEndpoint) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -62,15 +62,15 @@ type RulesEngineOperationPredicate struct {
 
 func (p RulesEngineOperationPredicate) Matches(input RulesEngine) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/frontdoor/2022-05-01/webapplicationfirewallmanagedrulesets/predicates.go b/resource-manager/frontdoor/2022-05-01/webapplicationfirewallmanagedrulesets/predicates.go
index 395a3b3c69b..1377bd339b0 100644
--- a/resource-manager/frontdoor/2022-05-01/webapplicationfirewallmanagedrulesets/predicates.go
+++ b/resource-manager/frontdoor/2022-05-01/webapplicationfirewallmanagedrulesets/predicates.go
@@ -12,19 +12,19 @@ type ManagedRuleSetDefinitionOperationPredicate struct {
 
 func (p ManagedRuleSetDefinitionOperationPredicate) Matches(input ManagedRuleSetDefinition) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/frontdoor/2022-05-01/webapplicationfirewallpolicies/predicates.go b/resource-manager/frontdoor/2022-05-01/webapplicationfirewallpolicies/predicates.go
index 9bdf8d1c8b6..a7973b0a14f 100644
--- a/resource-manager/frontdoor/2022-05-01/webapplicationfirewallpolicies/predicates.go
+++ b/resource-manager/frontdoor/2022-05-01/webapplicationfirewallpolicies/predicates.go
@@ -13,23 +13,23 @@ type WebApplicationFirewallPolicyOperationPredicate struct {
 
 func (p WebApplicationFirewallPolicyOperationPredicate) Matches(input WebApplicationFirewallPolicy) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/graphservices/2023-04-13/graphservicesprods/predicates.go b/resource-manager/graphservices/2023-04-13/graphservicesprods/predicates.go
index 39ebebaee43..24271579b78 100644
--- a/resource-manager/graphservices/2023-04-13/graphservicesprods/predicates.go
+++ b/resource-manager/graphservices/2023-04-13/graphservicesprods/predicates.go
@@ -12,19 +12,19 @@ type AccountResourceOperationPredicate struct {
 
 func (p AccountResourceOperationPredicate) Matches(input AccountResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/hardwaresecuritymodules/2021-11-30/dedicatedhsms/predicates.go b/resource-manager/hardwaresecuritymodules/2021-11-30/dedicatedhsms/predicates.go
index 8ac457eca1d..a732c07c71d 100644
--- a/resource-manager/hardwaresecuritymodules/2021-11-30/dedicatedhsms/predicates.go
+++ b/resource-manager/hardwaresecuritymodules/2021-11-30/dedicatedhsms/predicates.go
@@ -12,7 +12,7 @@ type DedicatedHsmOperationPredicate struct {
 
 func (p DedicatedHsmOperationPredicate) Matches(input DedicatedHsm) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p DedicatedHsmOperationPredicate) Matches(input DedicatedHsm) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -37,7 +37,7 @@ type OutboundEnvironmentEndpointOperationPredicate struct {
 
 func (p OutboundEnvironmentEndpointOperationPredicate) Matches(input OutboundEnvironmentEndpoint) bool {
 
-	if p.Category != nil && (input.Category == nil && *p.Category != *input.Category) {
+	if p.Category != nil && (input.Category == nil || *p.Category != *input.Category) {
 		return false
 	}
 
diff --git a/resource-manager/hdinsight/2018-06-01-preview/applications/predicates.go b/resource-manager/hdinsight/2018-06-01-preview/applications/predicates.go
index 73b48fab5ad..05ce0f966d3 100644
--- a/resource-manager/hdinsight/2018-06-01-preview/applications/predicates.go
+++ b/resource-manager/hdinsight/2018-06-01-preview/applications/predicates.go
@@ -12,19 +12,19 @@ type ApplicationOperationPredicate struct {
 
 func (p ApplicationOperationPredicate) Matches(input Application) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/hdinsight/2018-06-01-preview/clusters/predicates.go b/resource-manager/hdinsight/2018-06-01-preview/clusters/predicates.go
index adeb91d825a..2d93344a6b8 100644
--- a/resource-manager/hdinsight/2018-06-01-preview/clusters/predicates.go
+++ b/resource-manager/hdinsight/2018-06-01-preview/clusters/predicates.go
@@ -13,23 +13,23 @@ type ClusterOperationPredicate struct {
 
 func (p ClusterOperationPredicate) Matches(input Cluster) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/hdinsight/2018-06-01-preview/scriptactions/predicates.go b/resource-manager/hdinsight/2018-06-01-preview/scriptactions/predicates.go
index 6dcdb09cabe..51b7b07dfdb 100644
--- a/resource-manager/hdinsight/2018-06-01-preview/scriptactions/predicates.go
+++ b/resource-manager/hdinsight/2018-06-01-preview/scriptactions/predicates.go
@@ -12,7 +12,7 @@ type RuntimeScriptActionDetailOperationPredicate struct {
 
 func (p RuntimeScriptActionDetailOperationPredicate) Matches(input RuntimeScriptActionDetail) bool {
 
-	if p.ApplicationName != nil && (input.ApplicationName == nil && *p.ApplicationName != *input.ApplicationName) {
+	if p.ApplicationName != nil && (input.ApplicationName == nil || *p.ApplicationName != *input.ApplicationName) {
 		return false
 	}
 
@@ -20,7 +20,7 @@ func (p RuntimeScriptActionDetailOperationPredicate) Matches(input RuntimeScript
 		return false
 	}
 
-	if p.Parameters != nil && (input.Parameters == nil && *p.Parameters != *input.Parameters) {
+	if p.Parameters != nil && (input.Parameters == nil || *p.Parameters != *input.Parameters) {
 		return false
 	}
 
diff --git a/resource-manager/hdinsight/2018-06-01-preview/scriptexecutionhistory/predicates.go b/resource-manager/hdinsight/2018-06-01-preview/scriptexecutionhistory/predicates.go
index 1d5a1dc32a6..ba90df986fb 100644
--- a/resource-manager/hdinsight/2018-06-01-preview/scriptexecutionhistory/predicates.go
+++ b/resource-manager/hdinsight/2018-06-01-preview/scriptexecutionhistory/predicates.go
@@ -12,7 +12,7 @@ type RuntimeScriptActionDetailOperationPredicate struct {
 
 func (p RuntimeScriptActionDetailOperationPredicate) Matches(input RuntimeScriptActionDetail) bool {
 
-	if p.ApplicationName != nil && (input.ApplicationName == nil && *p.ApplicationName != *input.ApplicationName) {
+	if p.ApplicationName != nil && (input.ApplicationName == nil || *p.ApplicationName != *input.ApplicationName) {
 		return false
 	}
 
@@ -20,7 +20,7 @@ func (p RuntimeScriptActionDetailOperationPredicate) Matches(input RuntimeScript
 		return false
 	}
 
-	if p.Parameters != nil && (input.Parameters == nil && *p.Parameters != *input.Parameters) {
+	if p.Parameters != nil && (input.Parameters == nil || *p.Parameters != *input.Parameters) {
 		return false
 	}
 
diff --git a/resource-manager/hdinsight/2021-06-01/applications/predicates.go b/resource-manager/hdinsight/2021-06-01/applications/predicates.go
index 73b48fab5ad..05ce0f966d3 100644
--- a/resource-manager/hdinsight/2021-06-01/applications/predicates.go
+++ b/resource-manager/hdinsight/2021-06-01/applications/predicates.go
@@ -12,19 +12,19 @@ type ApplicationOperationPredicate struct {
 
 func (p ApplicationOperationPredicate) Matches(input Application) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/hdinsight/2021-06-01/clusters/predicates.go b/resource-manager/hdinsight/2021-06-01/clusters/predicates.go
index 8f8a3127d8f..a480c0fa845 100644
--- a/resource-manager/hdinsight/2021-06-01/clusters/predicates.go
+++ b/resource-manager/hdinsight/2021-06-01/clusters/predicates.go
@@ -13,11 +13,11 @@ type ClusterOperationPredicate struct {
 
 func (p ClusterOperationPredicate) Matches(input Cluster) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p ClusterOperationPredicate) Matches(input Cluster) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/hdinsight/2021-06-01/privateendpointconnections/predicates.go b/resource-manager/hdinsight/2021-06-01/privateendpointconnections/predicates.go
index bea3f66b397..4a03a91ce52 100644
--- a/resource-manager/hdinsight/2021-06-01/privateendpointconnections/predicates.go
+++ b/resource-manager/hdinsight/2021-06-01/privateendpointconnections/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/hdinsight/2021-06-01/scriptactions/predicates.go b/resource-manager/hdinsight/2021-06-01/scriptactions/predicates.go
index 1a43c7eceeb..eca65eb76ab 100644
--- a/resource-manager/hdinsight/2021-06-01/scriptactions/predicates.go
+++ b/resource-manager/hdinsight/2021-06-01/scriptactions/predicates.go
@@ -18,15 +18,15 @@ type RuntimeScriptActionDetailOperationPredicate struct {
 
 func (p RuntimeScriptActionDetailOperationPredicate) Matches(input RuntimeScriptActionDetail) bool {
 
-	if p.ApplicationName != nil && (input.ApplicationName == nil && *p.ApplicationName != *input.ApplicationName) {
+	if p.ApplicationName != nil && (input.ApplicationName == nil || *p.ApplicationName != *input.ApplicationName) {
 		return false
 	}
 
-	if p.DebugInformation != nil && (input.DebugInformation == nil && *p.DebugInformation != *input.DebugInformation) {
+	if p.DebugInformation != nil && (input.DebugInformation == nil || *p.DebugInformation != *input.DebugInformation) {
 		return false
 	}
 
-	if p.EndTime != nil && (input.EndTime == nil && *p.EndTime != *input.EndTime) {
+	if p.EndTime != nil && (input.EndTime == nil || *p.EndTime != *input.EndTime) {
 		return false
 	}
 
@@ -34,23 +34,23 @@ func (p RuntimeScriptActionDetailOperationPredicate) Matches(input RuntimeScript
 		return false
 	}
 
-	if p.Operation != nil && (input.Operation == nil && *p.Operation != *input.Operation) {
+	if p.Operation != nil && (input.Operation == nil || *p.Operation != *input.Operation) {
 		return false
 	}
 
-	if p.Parameters != nil && (input.Parameters == nil && *p.Parameters != *input.Parameters) {
+	if p.Parameters != nil && (input.Parameters == nil || *p.Parameters != *input.Parameters) {
 		return false
 	}
 
-	if p.ScriptExecutionId != nil && (input.ScriptExecutionId == nil && *p.ScriptExecutionId != *input.ScriptExecutionId) {
+	if p.ScriptExecutionId != nil && (input.ScriptExecutionId == nil || *p.ScriptExecutionId != *input.ScriptExecutionId) {
 		return false
 	}
 
-	if p.StartTime != nil && (input.StartTime == nil && *p.StartTime != *input.StartTime) {
+	if p.StartTime != nil && (input.StartTime == nil || *p.StartTime != *input.StartTime) {
 		return false
 	}
 
-	if p.Status != nil && (input.Status == nil && *p.Status != *input.Status) {
+	if p.Status != nil && (input.Status == nil || *p.Status != *input.Status) {
 		return false
 	}
 
diff --git a/resource-manager/hdinsight/2021-06-01/scriptexecutionhistory/predicates.go b/resource-manager/hdinsight/2021-06-01/scriptexecutionhistory/predicates.go
index 0bc8be3df5c..822195baf32 100644
--- a/resource-manager/hdinsight/2021-06-01/scriptexecutionhistory/predicates.go
+++ b/resource-manager/hdinsight/2021-06-01/scriptexecutionhistory/predicates.go
@@ -18,15 +18,15 @@ type RuntimeScriptActionDetailOperationPredicate struct {
 
 func (p RuntimeScriptActionDetailOperationPredicate) Matches(input RuntimeScriptActionDetail) bool {
 
-	if p.ApplicationName != nil && (input.ApplicationName == nil && *p.ApplicationName != *input.ApplicationName) {
+	if p.ApplicationName != nil && (input.ApplicationName == nil || *p.ApplicationName != *input.ApplicationName) {
 		return false
 	}
 
-	if p.DebugInformation != nil && (input.DebugInformation == nil && *p.DebugInformation != *input.DebugInformation) {
+	if p.DebugInformation != nil && (input.DebugInformation == nil || *p.DebugInformation != *input.DebugInformation) {
 		return false
 	}
 
-	if p.EndTime != nil && (input.EndTime == nil && *p.EndTime != *input.EndTime) {
+	if p.EndTime != nil && (input.EndTime == nil || *p.EndTime != *input.EndTime) {
 		return false
 	}
 
@@ -34,23 +34,23 @@ func (p RuntimeScriptActionDetailOperationPredicate) Matches(input RuntimeScript
 		return false
 	}
 
-	if p.Operation != nil && (input.Operation == nil && *p.Operation != *input.Operation) {
+	if p.Operation != nil && (input.Operation == nil || *p.Operation != *input.Operation) {
 		return false
 	}
 
-	if p.Parameters != nil && (input.Parameters == nil && *p.Parameters != *input.Parameters) {
+	if p.Parameters != nil && (input.Parameters == nil || *p.Parameters != *input.Parameters) {
 		return false
 	}
 
-	if p.ScriptExecutionId != nil && (input.ScriptExecutionId == nil && *p.ScriptExecutionId != *input.ScriptExecutionId) {
+	if p.ScriptExecutionId != nil && (input.ScriptExecutionId == nil || *p.ScriptExecutionId != *input.ScriptExecutionId) {
 		return false
 	}
 
-	if p.StartTime != nil && (input.StartTime == nil && *p.StartTime != *input.StartTime) {
+	if p.StartTime != nil && (input.StartTime == nil || *p.StartTime != *input.StartTime) {
 		return false
 	}
 
-	if p.Status != nil && (input.Status == nil && *p.Status != *input.Status) {
+	if p.Status != nil && (input.Status == nil || *p.Status != *input.Status) {
 		return false
 	}
 
diff --git a/resource-manager/healthbot/2022-08-08/healthbots/predicates.go b/resource-manager/healthbot/2022-08-08/healthbots/predicates.go
index 2dddffbbc2f..d58cae790da 100644
--- a/resource-manager/healthbot/2022-08-08/healthbots/predicates.go
+++ b/resource-manager/healthbot/2022-08-08/healthbots/predicates.go
@@ -12,7 +12,7 @@ type HealthBotOperationPredicate struct {
 
 func (p HealthBotOperationPredicate) Matches(input HealthBot) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p HealthBotOperationPredicate) Matches(input HealthBot) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/healthbot/2023-05-01/healthbots/predicates.go b/resource-manager/healthbot/2023-05-01/healthbots/predicates.go
index 2dddffbbc2f..d58cae790da 100644
--- a/resource-manager/healthbot/2023-05-01/healthbots/predicates.go
+++ b/resource-manager/healthbot/2023-05-01/healthbots/predicates.go
@@ -12,7 +12,7 @@ type HealthBotOperationPredicate struct {
 
 func (p HealthBotOperationPredicate) Matches(input HealthBot) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p HealthBotOperationPredicate) Matches(input HealthBot) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/healthcareapis/2022-12-01/collection/predicates.go b/resource-manager/healthcareapis/2022-12-01/collection/predicates.go
index 6550c429688..fcfbeeb8c82 100644
--- a/resource-manager/healthcareapis/2022-12-01/collection/predicates.go
+++ b/resource-manager/healthcareapis/2022-12-01/collection/predicates.go
@@ -13,11 +13,11 @@ type ServicesDescriptionOperationPredicate struct {
 
 func (p ServicesDescriptionOperationPredicate) Matches(input ServicesDescription) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p ServicesDescriptionOperationPredicate) Matches(input ServicesDescription
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/healthcareapis/2022-12-01/dicomservices/predicates.go b/resource-manager/healthcareapis/2022-12-01/dicomservices/predicates.go
index 962ddd81719..7dc837d84d6 100644
--- a/resource-manager/healthcareapis/2022-12-01/dicomservices/predicates.go
+++ b/resource-manager/healthcareapis/2022-12-01/dicomservices/predicates.go
@@ -13,23 +13,23 @@ type DicomServiceOperationPredicate struct {
 
 func (p DicomServiceOperationPredicate) Matches(input DicomService) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/healthcareapis/2022-12-01/fhirservices/predicates.go b/resource-manager/healthcareapis/2022-12-01/fhirservices/predicates.go
index 5414fb1c584..c7e5fd7668f 100644
--- a/resource-manager/healthcareapis/2022-12-01/fhirservices/predicates.go
+++ b/resource-manager/healthcareapis/2022-12-01/fhirservices/predicates.go
@@ -13,23 +13,23 @@ type FhirServiceOperationPredicate struct {
 
 func (p FhirServiceOperationPredicate) Matches(input FhirService) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/healthcareapis/2022-12-01/iotconnectors/predicates.go b/resource-manager/healthcareapis/2022-12-01/iotconnectors/predicates.go
index 53d6cc366a5..48c15c6b355 100644
--- a/resource-manager/healthcareapis/2022-12-01/iotconnectors/predicates.go
+++ b/resource-manager/healthcareapis/2022-12-01/iotconnectors/predicates.go
@@ -13,23 +13,23 @@ type IotConnectorOperationPredicate struct {
 
 func (p IotConnectorOperationPredicate) Matches(input IotConnector) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -46,23 +46,23 @@ type IotFhirDestinationOperationPredicate struct {
 
 func (p IotFhirDestinationOperationPredicate) Matches(input IotFhirDestination) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/healthcareapis/2022-12-01/workspaces/predicates.go b/resource-manager/healthcareapis/2022-12-01/workspaces/predicates.go
index 9498e01d613..89e28d54a46 100644
--- a/resource-manager/healthcareapis/2022-12-01/workspaces/predicates.go
+++ b/resource-manager/healthcareapis/2022-12-01/workspaces/predicates.go
@@ -13,23 +13,23 @@ type WorkspaceOperationPredicate struct {
 
 func (p WorkspaceOperationPredicate) Matches(input Workspace) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/healthcareapis/2023-02-28/collection/predicates.go b/resource-manager/healthcareapis/2023-02-28/collection/predicates.go
index 6550c429688..fcfbeeb8c82 100644
--- a/resource-manager/healthcareapis/2023-02-28/collection/predicates.go
+++ b/resource-manager/healthcareapis/2023-02-28/collection/predicates.go
@@ -13,11 +13,11 @@ type ServicesDescriptionOperationPredicate struct {
 
 func (p ServicesDescriptionOperationPredicate) Matches(input ServicesDescription) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p ServicesDescriptionOperationPredicate) Matches(input ServicesDescription
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/healthcareapis/2023-02-28/dicomservices/predicates.go b/resource-manager/healthcareapis/2023-02-28/dicomservices/predicates.go
index 962ddd81719..7dc837d84d6 100644
--- a/resource-manager/healthcareapis/2023-02-28/dicomservices/predicates.go
+++ b/resource-manager/healthcareapis/2023-02-28/dicomservices/predicates.go
@@ -13,23 +13,23 @@ type DicomServiceOperationPredicate struct {
 
 func (p DicomServiceOperationPredicate) Matches(input DicomService) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/healthcareapis/2023-02-28/fhirservices/predicates.go b/resource-manager/healthcareapis/2023-02-28/fhirservices/predicates.go
index 5414fb1c584..c7e5fd7668f 100644
--- a/resource-manager/healthcareapis/2023-02-28/fhirservices/predicates.go
+++ b/resource-manager/healthcareapis/2023-02-28/fhirservices/predicates.go
@@ -13,23 +13,23 @@ type FhirServiceOperationPredicate struct {
 
 func (p FhirServiceOperationPredicate) Matches(input FhirService) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/healthcareapis/2023-02-28/iotconnectors/predicates.go b/resource-manager/healthcareapis/2023-02-28/iotconnectors/predicates.go
index 53d6cc366a5..48c15c6b355 100644
--- a/resource-manager/healthcareapis/2023-02-28/iotconnectors/predicates.go
+++ b/resource-manager/healthcareapis/2023-02-28/iotconnectors/predicates.go
@@ -13,23 +13,23 @@ type IotConnectorOperationPredicate struct {
 
 func (p IotConnectorOperationPredicate) Matches(input IotConnector) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -46,23 +46,23 @@ type IotFhirDestinationOperationPredicate struct {
 
 func (p IotFhirDestinationOperationPredicate) Matches(input IotFhirDestination) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/healthcareapis/2023-02-28/workspaces/predicates.go b/resource-manager/healthcareapis/2023-02-28/workspaces/predicates.go
index 9498e01d613..89e28d54a46 100644
--- a/resource-manager/healthcareapis/2023-02-28/workspaces/predicates.go
+++ b/resource-manager/healthcareapis/2023-02-28/workspaces/predicates.go
@@ -13,23 +13,23 @@ type WorkspaceOperationPredicate struct {
 
 func (p WorkspaceOperationPredicate) Matches(input Workspace) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/hybridcompute/2022-11-10/machineextensions/predicates.go b/resource-manager/hybridcompute/2022-11-10/machineextensions/predicates.go
index 575795503e3..2eae3b57239 100644
--- a/resource-manager/hybridcompute/2022-11-10/machineextensions/predicates.go
+++ b/resource-manager/hybridcompute/2022-11-10/machineextensions/predicates.go
@@ -12,7 +12,7 @@ type MachineExtensionOperationPredicate struct {
 
 func (p MachineExtensionOperationPredicate) Matches(input MachineExtension) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p MachineExtensionOperationPredicate) Matches(input MachineExtension) bool
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/hybridcompute/2022-11-10/machines/predicates.go b/resource-manager/hybridcompute/2022-11-10/machines/predicates.go
index d371fadd5ca..0f0fa8b2454 100644
--- a/resource-manager/hybridcompute/2022-11-10/machines/predicates.go
+++ b/resource-manager/hybridcompute/2022-11-10/machines/predicates.go
@@ -12,7 +12,7 @@ type MachineOperationPredicate struct {
 
 func (p MachineOperationPredicate) Matches(input Machine) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p MachineOperationPredicate) Matches(input Machine) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/hybridcompute/2022-11-10/privateendpointconnections/predicates.go b/resource-manager/hybridcompute/2022-11-10/privateendpointconnections/predicates.go
index bea3f66b397..4a03a91ce52 100644
--- a/resource-manager/hybridcompute/2022-11-10/privateendpointconnections/predicates.go
+++ b/resource-manager/hybridcompute/2022-11-10/privateendpointconnections/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/hybridcompute/2022-11-10/privatelinkresources/predicates.go b/resource-manager/hybridcompute/2022-11-10/privatelinkresources/predicates.go
index 29d787f073a..19b771c3994 100644
--- a/resource-manager/hybridcompute/2022-11-10/privatelinkresources/predicates.go
+++ b/resource-manager/hybridcompute/2022-11-10/privatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/hybridcompute/2022-11-10/privatelinkscopes/predicates.go b/resource-manager/hybridcompute/2022-11-10/privatelinkscopes/predicates.go
index 862b3106529..d0efec03876 100644
--- a/resource-manager/hybridcompute/2022-11-10/privatelinkscopes/predicates.go
+++ b/resource-manager/hybridcompute/2022-11-10/privatelinkscopes/predicates.go
@@ -12,7 +12,7 @@ type HybridComputePrivateLinkScopeOperationPredicate struct {
 
 func (p HybridComputePrivateLinkScopeOperationPredicate) Matches(input HybridComputePrivateLinkScope) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p HybridComputePrivateLinkScopeOperationPredicate) Matches(input HybridCom
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/hybridcompute/2022-12-27/machineextensions/predicates.go b/resource-manager/hybridcompute/2022-12-27/machineextensions/predicates.go
index 575795503e3..2eae3b57239 100644
--- a/resource-manager/hybridcompute/2022-12-27/machineextensions/predicates.go
+++ b/resource-manager/hybridcompute/2022-12-27/machineextensions/predicates.go
@@ -12,7 +12,7 @@ type MachineExtensionOperationPredicate struct {
 
 func (p MachineExtensionOperationPredicate) Matches(input MachineExtension) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p MachineExtensionOperationPredicate) Matches(input MachineExtension) bool
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/hybridcompute/2022-12-27/machines/predicates.go b/resource-manager/hybridcompute/2022-12-27/machines/predicates.go
index d371fadd5ca..0f0fa8b2454 100644
--- a/resource-manager/hybridcompute/2022-12-27/machines/predicates.go
+++ b/resource-manager/hybridcompute/2022-12-27/machines/predicates.go
@@ -12,7 +12,7 @@ type MachineOperationPredicate struct {
 
 func (p MachineOperationPredicate) Matches(input Machine) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p MachineOperationPredicate) Matches(input Machine) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/hybridcompute/2022-12-27/privateendpointconnections/predicates.go b/resource-manager/hybridcompute/2022-12-27/privateendpointconnections/predicates.go
index bea3f66b397..4a03a91ce52 100644
--- a/resource-manager/hybridcompute/2022-12-27/privateendpointconnections/predicates.go
+++ b/resource-manager/hybridcompute/2022-12-27/privateendpointconnections/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/hybridcompute/2022-12-27/privatelinkresources/predicates.go b/resource-manager/hybridcompute/2022-12-27/privatelinkresources/predicates.go
index 29d787f073a..19b771c3994 100644
--- a/resource-manager/hybridcompute/2022-12-27/privatelinkresources/predicates.go
+++ b/resource-manager/hybridcompute/2022-12-27/privatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/hybridcompute/2022-12-27/privatelinkscopes/predicates.go b/resource-manager/hybridcompute/2022-12-27/privatelinkscopes/predicates.go
index 862b3106529..d0efec03876 100644
--- a/resource-manager/hybridcompute/2022-12-27/privatelinkscopes/predicates.go
+++ b/resource-manager/hybridcompute/2022-12-27/privatelinkscopes/predicates.go
@@ -12,7 +12,7 @@ type HybridComputePrivateLinkScopeOperationPredicate struct {
 
 func (p HybridComputePrivateLinkScopeOperationPredicate) Matches(input HybridComputePrivateLinkScope) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p HybridComputePrivateLinkScopeOperationPredicate) Matches(input HybridCom
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/hybridkubernetes/2021-10-01/connectedclusters/predicates.go b/resource-manager/hybridkubernetes/2021-10-01/connectedclusters/predicates.go
index 004e1bd53cb..a1dcf6aaa3a 100644
--- a/resource-manager/hybridkubernetes/2021-10-01/connectedclusters/predicates.go
+++ b/resource-manager/hybridkubernetes/2021-10-01/connectedclusters/predicates.go
@@ -12,7 +12,7 @@ type ConnectedClusterOperationPredicate struct {
 
 func (p ConnectedClusterOperationPredicate) Matches(input ConnectedCluster) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ConnectedClusterOperationPredicate) Matches(input ConnectedCluster) bool
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/insights/2015-04-01/activitylogs/predicates.go b/resource-manager/insights/2015-04-01/activitylogs/predicates.go
index f375211f01b..dbcb6273ad2 100644
--- a/resource-manager/insights/2015-04-01/activitylogs/predicates.go
+++ b/resource-manager/insights/2015-04-01/activitylogs/predicates.go
@@ -20,51 +20,51 @@ type EventDataOperationPredicate struct {
 
 func (p EventDataOperationPredicate) Matches(input EventData) bool {
 
-	if p.Caller != nil && (input.Caller == nil && *p.Caller != *input.Caller) {
+	if p.Caller != nil && (input.Caller == nil || *p.Caller != *input.Caller) {
 		return false
 	}
 
-	if p.CorrelationId != nil && (input.CorrelationId == nil && *p.CorrelationId != *input.CorrelationId) {
+	if p.CorrelationId != nil && (input.CorrelationId == nil || *p.CorrelationId != *input.CorrelationId) {
 		return false
 	}
 
-	if p.Description != nil && (input.Description == nil && *p.Description != *input.Description) {
+	if p.Description != nil && (input.Description == nil || *p.Description != *input.Description) {
 		return false
 	}
 
-	if p.EventDataId != nil && (input.EventDataId == nil && *p.EventDataId != *input.EventDataId) {
+	if p.EventDataId != nil && (input.EventDataId == nil || *p.EventDataId != *input.EventDataId) {
 		return false
 	}
 
-	if p.EventTimestamp != nil && (input.EventTimestamp == nil && *p.EventTimestamp != *input.EventTimestamp) {
+	if p.EventTimestamp != nil && (input.EventTimestamp == nil || *p.EventTimestamp != *input.EventTimestamp) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.OperationId != nil && (input.OperationId == nil && *p.OperationId != *input.OperationId) {
+	if p.OperationId != nil && (input.OperationId == nil || *p.OperationId != *input.OperationId) {
 		return false
 	}
 
-	if p.ResourceGroupName != nil && (input.ResourceGroupName == nil && *p.ResourceGroupName != *input.ResourceGroupName) {
+	if p.ResourceGroupName != nil && (input.ResourceGroupName == nil || *p.ResourceGroupName != *input.ResourceGroupName) {
 		return false
 	}
 
-	if p.ResourceId != nil && (input.ResourceId == nil && *p.ResourceId != *input.ResourceId) {
+	if p.ResourceId != nil && (input.ResourceId == nil || *p.ResourceId != *input.ResourceId) {
 		return false
 	}
 
-	if p.SubmissionTimestamp != nil && (input.SubmissionTimestamp == nil && *p.SubmissionTimestamp != *input.SubmissionTimestamp) {
+	if p.SubmissionTimestamp != nil && (input.SubmissionTimestamp == nil || *p.SubmissionTimestamp != *input.SubmissionTimestamp) {
 		return false
 	}
 
-	if p.SubscriptionId != nil && (input.SubscriptionId == nil && *p.SubscriptionId != *input.SubscriptionId) {
+	if p.SubscriptionId != nil && (input.SubscriptionId == nil || *p.SubscriptionId != *input.SubscriptionId) {
 		return false
 	}
 
-	if p.TenantId != nil && (input.TenantId == nil && *p.TenantId != *input.TenantId) {
+	if p.TenantId != nil && (input.TenantId == nil || *p.TenantId != *input.TenantId) {
 		return false
 	}
 
diff --git a/resource-manager/insights/2015-04-01/autoscalesettings/predicates.go b/resource-manager/insights/2015-04-01/autoscalesettings/predicates.go
index a7edb6bb789..5b96d5ca62f 100644
--- a/resource-manager/insights/2015-04-01/autoscalesettings/predicates.go
+++ b/resource-manager/insights/2015-04-01/autoscalesettings/predicates.go
@@ -12,7 +12,7 @@ type AutoscaleSettingResourceOperationPredicate struct {
 
 func (p AutoscaleSettingResourceOperationPredicate) Matches(input AutoscaleSettingResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p AutoscaleSettingResourceOperationPredicate) Matches(input AutoscaleSetti
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/insights/2015-04-01/tenantactivitylogs/predicates.go b/resource-manager/insights/2015-04-01/tenantactivitylogs/predicates.go
index 18cbfa9a4e9..69578331d59 100644
--- a/resource-manager/insights/2015-04-01/tenantactivitylogs/predicates.go
+++ b/resource-manager/insights/2015-04-01/tenantactivitylogs/predicates.go
@@ -20,51 +20,51 @@ type EventDataOperationPredicate struct {
 
 func (p EventDataOperationPredicate) Matches(input EventData) bool {
 
-	if p.Caller != nil && (input.Caller == nil && *p.Caller != *input.Caller) {
+	if p.Caller != nil && (input.Caller == nil || *p.Caller != *input.Caller) {
 		return false
 	}
 
-	if p.CorrelationId != nil && (input.CorrelationId == nil && *p.CorrelationId != *input.CorrelationId) {
+	if p.CorrelationId != nil && (input.CorrelationId == nil || *p.CorrelationId != *input.CorrelationId) {
 		return false
 	}
 
-	if p.Description != nil && (input.Description == nil && *p.Description != *input.Description) {
+	if p.Description != nil && (input.Description == nil || *p.Description != *input.Description) {
 		return false
 	}
 
-	if p.EventDataId != nil && (input.EventDataId == nil && *p.EventDataId != *input.EventDataId) {
+	if p.EventDataId != nil && (input.EventDataId == nil || *p.EventDataId != *input.EventDataId) {
 		return false
 	}
 
-	if p.EventTimestamp != nil && (input.EventTimestamp == nil && *p.EventTimestamp != *input.EventTimestamp) {
+	if p.EventTimestamp != nil && (input.EventTimestamp == nil || *p.EventTimestamp != *input.EventTimestamp) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.OperationId != nil && (input.OperationId == nil && *p.OperationId != *input.OperationId) {
+	if p.OperationId != nil && (input.OperationId == nil || *p.OperationId != *input.OperationId) {
 		return false
 	}
 
-	if p.ResourceGroupName != nil && (input.ResourceGroupName == nil && *p.ResourceGroupName != *input.ResourceGroupName) {
+	if p.ResourceGroupName != nil && (input.ResourceGroupName == nil || *p.ResourceGroupName != *input.ResourceGroupName) {
 		return false
 	}
 
-	if p.ResourceId != nil && (input.ResourceId == nil && *p.ResourceId != *input.ResourceId) {
+	if p.ResourceId != nil && (input.ResourceId == nil || *p.ResourceId != *input.ResourceId) {
 		return false
 	}
 
-	if p.SubmissionTimestamp != nil && (input.SubmissionTimestamp == nil && *p.SubmissionTimestamp != *input.SubmissionTimestamp) {
+	if p.SubmissionTimestamp != nil && (input.SubmissionTimestamp == nil || *p.SubmissionTimestamp != *input.SubmissionTimestamp) {
 		return false
 	}
 
-	if p.SubscriptionId != nil && (input.SubscriptionId == nil && *p.SubscriptionId != *input.SubscriptionId) {
+	if p.SubscriptionId != nil && (input.SubscriptionId == nil || *p.SubscriptionId != *input.SubscriptionId) {
 		return false
 	}
 
-	if p.TenantId != nil && (input.TenantId == nil && *p.TenantId != *input.TenantId) {
+	if p.TenantId != nil && (input.TenantId == nil || *p.TenantId != *input.TenantId) {
 		return false
 	}
 
diff --git a/resource-manager/insights/2019-10-17-preview/privateendpointconnections/predicates.go b/resource-manager/insights/2019-10-17-preview/privateendpointconnections/predicates.go
index bea3f66b397..4a03a91ce52 100644
--- a/resource-manager/insights/2019-10-17-preview/privateendpointconnections/predicates.go
+++ b/resource-manager/insights/2019-10-17-preview/privateendpointconnections/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/insights/2019-10-17-preview/privatelinkresources/predicates.go b/resource-manager/insights/2019-10-17-preview/privatelinkresources/predicates.go
index 29d787f073a..19b771c3994 100644
--- a/resource-manager/insights/2019-10-17-preview/privatelinkresources/predicates.go
+++ b/resource-manager/insights/2019-10-17-preview/privatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/insights/2019-10-17-preview/privatelinkscopedresources/predicates.go b/resource-manager/insights/2019-10-17-preview/privatelinkscopedresources/predicates.go
index 487b17e370b..c601ae0c434 100644
--- a/resource-manager/insights/2019-10-17-preview/privatelinkscopedresources/predicates.go
+++ b/resource-manager/insights/2019-10-17-preview/privatelinkscopedresources/predicates.go
@@ -11,15 +11,15 @@ type ScopedResourceOperationPredicate struct {
 
 func (p ScopedResourceOperationPredicate) Matches(input ScopedResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/insights/2019-10-17-preview/privatelinkscopesapis/predicates.go b/resource-manager/insights/2019-10-17-preview/privatelinkscopesapis/predicates.go
index 0a11137bda2..627be525eca 100644
--- a/resource-manager/insights/2019-10-17-preview/privatelinkscopesapis/predicates.go
+++ b/resource-manager/insights/2019-10-17-preview/privatelinkscopesapis/predicates.go
@@ -12,7 +12,7 @@ type AzureMonitorPrivateLinkScopeOperationPredicate struct {
 
 func (p AzureMonitorPrivateLinkScopeOperationPredicate) Matches(input AzureMonitorPrivateLinkScope) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p AzureMonitorPrivateLinkScopeOperationPredicate) Matches(input AzureMonit
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/insights/2020-10-01/activitylogalertsapis/predicates.go b/resource-manager/insights/2020-10-01/activitylogalertsapis/predicates.go
index 8633f20e31c..3392ff05911 100644
--- a/resource-manager/insights/2020-10-01/activitylogalertsapis/predicates.go
+++ b/resource-manager/insights/2020-10-01/activitylogalertsapis/predicates.go
@@ -12,19 +12,19 @@ type ActivityLogAlertResourceOperationPredicate struct {
 
 func (p ActivityLogAlertResourceOperationPredicate) Matches(input ActivityLogAlertResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/insights/2021-04-01/datacollectionendpoints/predicates.go b/resource-manager/insights/2021-04-01/datacollectionendpoints/predicates.go
index a03822c8960..147344fb010 100644
--- a/resource-manager/insights/2021-04-01/datacollectionendpoints/predicates.go
+++ b/resource-manager/insights/2021-04-01/datacollectionendpoints/predicates.go
@@ -13,11 +13,11 @@ type DataCollectionEndpointResourceOperationPredicate struct {
 
 func (p DataCollectionEndpointResourceOperationPredicate) Matches(input DataCollectionEndpointResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p DataCollectionEndpointResourceOperationPredicate) Matches(input DataColl
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/insights/2021-04-01/datacollectionruleassociations/predicates.go b/resource-manager/insights/2021-04-01/datacollectionruleassociations/predicates.go
index 31bc221edcf..4eda98a86ab 100644
--- a/resource-manager/insights/2021-04-01/datacollectionruleassociations/predicates.go
+++ b/resource-manager/insights/2021-04-01/datacollectionruleassociations/predicates.go
@@ -12,19 +12,19 @@ type DataCollectionRuleAssociationProxyOnlyResourceOperationPredicate struct {
 
 func (p DataCollectionRuleAssociationProxyOnlyResourceOperationPredicate) Matches(input DataCollectionRuleAssociationProxyOnlyResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/insights/2021-04-01/datacollectionrules/predicates.go b/resource-manager/insights/2021-04-01/datacollectionrules/predicates.go
index 8f5d51cfbfb..71960b7ef29 100644
--- a/resource-manager/insights/2021-04-01/datacollectionrules/predicates.go
+++ b/resource-manager/insights/2021-04-01/datacollectionrules/predicates.go
@@ -13,11 +13,11 @@ type DataCollectionRuleResourceOperationPredicate struct {
 
 func (p DataCollectionRuleResourceOperationPredicate) Matches(input DataCollectionRuleResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p DataCollectionRuleResourceOperationPredicate) Matches(input DataCollecti
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/insights/2021-05-01-preview/autoscalesettings/predicates.go b/resource-manager/insights/2021-05-01-preview/autoscalesettings/predicates.go
index a7edb6bb789..5b96d5ca62f 100644
--- a/resource-manager/insights/2021-05-01-preview/autoscalesettings/predicates.go
+++ b/resource-manager/insights/2021-05-01-preview/autoscalesettings/predicates.go
@@ -12,7 +12,7 @@ type AutoscaleSettingResourceOperationPredicate struct {
 
 func (p AutoscaleSettingResourceOperationPredicate) Matches(input AutoscaleSettingResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p AutoscaleSettingResourceOperationPredicate) Matches(input AutoscaleSetti
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/insights/2021-08-01/scheduledqueryrules/predicates.go b/resource-manager/insights/2021-08-01/scheduledqueryrules/predicates.go
index 09a029a80c4..32f0af8a6e8 100644
--- a/resource-manager/insights/2021-08-01/scheduledqueryrules/predicates.go
+++ b/resource-manager/insights/2021-08-01/scheduledqueryrules/predicates.go
@@ -13,11 +13,11 @@ type ScheduledQueryRuleResourceOperationPredicate struct {
 
 func (p ScheduledQueryRuleResourceOperationPredicate) Matches(input ScheduledQueryRuleResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p ScheduledQueryRuleResourceOperationPredicate) Matches(input ScheduledQue
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/insights/2022-06-01/datacollectionendpoints/predicates.go b/resource-manager/insights/2022-06-01/datacollectionendpoints/predicates.go
index a03822c8960..147344fb010 100644
--- a/resource-manager/insights/2022-06-01/datacollectionendpoints/predicates.go
+++ b/resource-manager/insights/2022-06-01/datacollectionendpoints/predicates.go
@@ -13,11 +13,11 @@ type DataCollectionEndpointResourceOperationPredicate struct {
 
 func (p DataCollectionEndpointResourceOperationPredicate) Matches(input DataCollectionEndpointResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p DataCollectionEndpointResourceOperationPredicate) Matches(input DataColl
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/insights/2022-06-01/datacollectionruleassociations/predicates.go b/resource-manager/insights/2022-06-01/datacollectionruleassociations/predicates.go
index 31bc221edcf..4eda98a86ab 100644
--- a/resource-manager/insights/2022-06-01/datacollectionruleassociations/predicates.go
+++ b/resource-manager/insights/2022-06-01/datacollectionruleassociations/predicates.go
@@ -12,19 +12,19 @@ type DataCollectionRuleAssociationProxyOnlyResourceOperationPredicate struct {
 
 func (p DataCollectionRuleAssociationProxyOnlyResourceOperationPredicate) Matches(input DataCollectionRuleAssociationProxyOnlyResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/insights/2022-06-01/datacollectionrules/predicates.go b/resource-manager/insights/2022-06-01/datacollectionrules/predicates.go
index 8f5d51cfbfb..71960b7ef29 100644
--- a/resource-manager/insights/2022-06-01/datacollectionrules/predicates.go
+++ b/resource-manager/insights/2022-06-01/datacollectionrules/predicates.go
@@ -13,11 +13,11 @@ type DataCollectionRuleResourceOperationPredicate struct {
 
 func (p DataCollectionRuleResourceOperationPredicate) Matches(input DataCollectionRuleResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p DataCollectionRuleResourceOperationPredicate) Matches(input DataCollecti
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/insights/2022-10-01/autoscalesettings/predicates.go b/resource-manager/insights/2022-10-01/autoscalesettings/predicates.go
index a7edb6bb789..5b96d5ca62f 100644
--- a/resource-manager/insights/2022-10-01/autoscalesettings/predicates.go
+++ b/resource-manager/insights/2022-10-01/autoscalesettings/predicates.go
@@ -12,7 +12,7 @@ type AutoscaleSettingResourceOperationPredicate struct {
 
 func (p AutoscaleSettingResourceOperationPredicate) Matches(input AutoscaleSettingResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p AutoscaleSettingResourceOperationPredicate) Matches(input AutoscaleSetti
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/insights/2023-04-03/azuremonitorworkspaces/predicates.go b/resource-manager/insights/2023-04-03/azuremonitorworkspaces/predicates.go
index dbb4170d39f..0a07735fae3 100644
--- a/resource-manager/insights/2023-04-03/azuremonitorworkspaces/predicates.go
+++ b/resource-manager/insights/2023-04-03/azuremonitorworkspaces/predicates.go
@@ -13,11 +13,11 @@ type AzureMonitorWorkspaceResourceOperationPredicate struct {
 
 func (p AzureMonitorWorkspaceResourceOperationPredicate) Matches(input AzureMonitorWorkspaceResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p AzureMonitorWorkspaceResourceOperationPredicate) Matches(input AzureMoni
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/iotcentral/2021-11-01-preview/apps/predicates.go b/resource-manager/iotcentral/2021-11-01-preview/apps/predicates.go
index 2a87f60595d..d527a493576 100644
--- a/resource-manager/iotcentral/2021-11-01-preview/apps/predicates.go
+++ b/resource-manager/iotcentral/2021-11-01-preview/apps/predicates.go
@@ -12,7 +12,7 @@ type AppOperationPredicate struct {
 
 func (p AppOperationPredicate) Matches(input App) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p AppOperationPredicate) Matches(input App) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -43,31 +43,31 @@ type AppTemplateOperationPredicate struct {
 
 func (p AppTemplateOperationPredicate) Matches(input AppTemplate) bool {
 
-	if p.Description != nil && (input.Description == nil && *p.Description != *input.Description) {
+	if p.Description != nil && (input.Description == nil || *p.Description != *input.Description) {
 		return false
 	}
 
-	if p.Industry != nil && (input.Industry == nil && *p.Industry != *input.Industry) {
+	if p.Industry != nil && (input.Industry == nil || *p.Industry != *input.Industry) {
 		return false
 	}
 
-	if p.ManifestId != nil && (input.ManifestId == nil && *p.ManifestId != *input.ManifestId) {
+	if p.ManifestId != nil && (input.ManifestId == nil || *p.ManifestId != *input.ManifestId) {
 		return false
 	}
 
-	if p.ManifestVersion != nil && (input.ManifestVersion == nil && *p.ManifestVersion != *input.ManifestVersion) {
+	if p.ManifestVersion != nil && (input.ManifestVersion == nil || *p.ManifestVersion != *input.ManifestVersion) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Order != nil && (input.Order == nil && *p.Order != *input.Order) {
+	if p.Order != nil && (input.Order == nil || *p.Order != *input.Order) {
 		return false
 	}
 
-	if p.Title != nil && (input.Title == nil && *p.Title != *input.Title) {
+	if p.Title != nil && (input.Title == nil || *p.Title != *input.Title) {
 		return false
 	}
 
diff --git a/resource-manager/keyvault/2021-10-01/keys/predicates.go b/resource-manager/keyvault/2021-10-01/keys/predicates.go
index a63cab4f99c..d7bea89219a 100644
--- a/resource-manager/keyvault/2021-10-01/keys/predicates.go
+++ b/resource-manager/keyvault/2021-10-01/keys/predicates.go
@@ -12,19 +12,19 @@ type KeyOperationPredicate struct {
 
 func (p KeyOperationPredicate) Matches(input Key) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/keyvault/2021-10-01/managedhsms/predicates.go b/resource-manager/keyvault/2021-10-01/managedhsms/predicates.go
index 0f74ecc37d8..598d2e6d12b 100644
--- a/resource-manager/keyvault/2021-10-01/managedhsms/predicates.go
+++ b/resource-manager/keyvault/2021-10-01/managedhsms/predicates.go
@@ -11,15 +11,15 @@ type DeletedManagedHsmOperationPredicate struct {
 
 func (p DeletedManagedHsmOperationPredicate) Matches(input DeletedManagedHsm) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -35,19 +35,19 @@ type ManagedHsmOperationPredicate struct {
 
 func (p ManagedHsmOperationPredicate) Matches(input ManagedHsm) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/keyvault/2021-10-01/mhsmlistprivateendpointconnections/predicates.go b/resource-manager/keyvault/2021-10-01/mhsmlistprivateendpointconnections/predicates.go
index 3bc6fdbd558..18e2f2156a7 100644
--- a/resource-manager/keyvault/2021-10-01/mhsmlistprivateendpointconnections/predicates.go
+++ b/resource-manager/keyvault/2021-10-01/mhsmlistprivateendpointconnections/predicates.go
@@ -13,23 +13,23 @@ type MHSMPrivateEndpointConnectionOperationPredicate struct {
 
 func (p MHSMPrivateEndpointConnectionOperationPredicate) Matches(input MHSMPrivateEndpointConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/keyvault/2021-10-01/privateendpointconnections/predicates.go b/resource-manager/keyvault/2021-10-01/privateendpointconnections/predicates.go
index 8a981bfd857..accb20a0cc4 100644
--- a/resource-manager/keyvault/2021-10-01/privateendpointconnections/predicates.go
+++ b/resource-manager/keyvault/2021-10-01/privateendpointconnections/predicates.go
@@ -13,23 +13,23 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/keyvault/2021-10-01/secrets/predicates.go b/resource-manager/keyvault/2021-10-01/secrets/predicates.go
index 9d694420242..1eb8d4feaa8 100644
--- a/resource-manager/keyvault/2021-10-01/secrets/predicates.go
+++ b/resource-manager/keyvault/2021-10-01/secrets/predicates.go
@@ -12,19 +12,19 @@ type SecretOperationPredicate struct {
 
 func (p SecretOperationPredicate) Matches(input Secret) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/keyvault/2021-10-01/vaults/predicates.go b/resource-manager/keyvault/2021-10-01/vaults/predicates.go
index 5915479bd9d..ded74b94926 100644
--- a/resource-manager/keyvault/2021-10-01/vaults/predicates.go
+++ b/resource-manager/keyvault/2021-10-01/vaults/predicates.go
@@ -11,15 +11,15 @@ type DeletedVaultOperationPredicate struct {
 
 func (p DeletedVaultOperationPredicate) Matches(input DeletedVault) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -35,19 +35,19 @@ type ResourceOperationPredicate struct {
 
 func (p ResourceOperationPredicate) Matches(input Resource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -63,19 +63,19 @@ type VaultOperationPredicate struct {
 
 func (p VaultOperationPredicate) Matches(input Vault) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/keyvault/2022-11-01/keys/predicates.go b/resource-manager/keyvault/2022-11-01/keys/predicates.go
index a63cab4f99c..d7bea89219a 100644
--- a/resource-manager/keyvault/2022-11-01/keys/predicates.go
+++ b/resource-manager/keyvault/2022-11-01/keys/predicates.go
@@ -12,19 +12,19 @@ type KeyOperationPredicate struct {
 
 func (p KeyOperationPredicate) Matches(input Key) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/keyvault/2022-11-01/managedhsmkeys/predicates.go b/resource-manager/keyvault/2022-11-01/managedhsmkeys/predicates.go
index 67684be9770..ed22e02a4b0 100644
--- a/resource-manager/keyvault/2022-11-01/managedhsmkeys/predicates.go
+++ b/resource-manager/keyvault/2022-11-01/managedhsmkeys/predicates.go
@@ -11,15 +11,15 @@ type ManagedHsmKeyOperationPredicate struct {
 
 func (p ManagedHsmKeyOperationPredicate) Matches(input ManagedHsmKey) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/keyvault/2022-11-01/managedhsms/predicates.go b/resource-manager/keyvault/2022-11-01/managedhsms/predicates.go
index 0f74ecc37d8..598d2e6d12b 100644
--- a/resource-manager/keyvault/2022-11-01/managedhsms/predicates.go
+++ b/resource-manager/keyvault/2022-11-01/managedhsms/predicates.go
@@ -11,15 +11,15 @@ type DeletedManagedHsmOperationPredicate struct {
 
 func (p DeletedManagedHsmOperationPredicate) Matches(input DeletedManagedHsm) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -35,19 +35,19 @@ type ManagedHsmOperationPredicate struct {
 
 func (p ManagedHsmOperationPredicate) Matches(input ManagedHsm) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/keyvault/2022-11-01/mhsmlistprivateendpointconnections/predicates.go b/resource-manager/keyvault/2022-11-01/mhsmlistprivateendpointconnections/predicates.go
index 3bc6fdbd558..18e2f2156a7 100644
--- a/resource-manager/keyvault/2022-11-01/mhsmlistprivateendpointconnections/predicates.go
+++ b/resource-manager/keyvault/2022-11-01/mhsmlistprivateendpointconnections/predicates.go
@@ -13,23 +13,23 @@ type MHSMPrivateEndpointConnectionOperationPredicate struct {
 
 func (p MHSMPrivateEndpointConnectionOperationPredicate) Matches(input MHSMPrivateEndpointConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/keyvault/2022-11-01/privateendpointconnections/predicates.go b/resource-manager/keyvault/2022-11-01/privateendpointconnections/predicates.go
index 8a981bfd857..accb20a0cc4 100644
--- a/resource-manager/keyvault/2022-11-01/privateendpointconnections/predicates.go
+++ b/resource-manager/keyvault/2022-11-01/privateendpointconnections/predicates.go
@@ -13,23 +13,23 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/keyvault/2022-11-01/secrets/predicates.go b/resource-manager/keyvault/2022-11-01/secrets/predicates.go
index 9d694420242..1eb8d4feaa8 100644
--- a/resource-manager/keyvault/2022-11-01/secrets/predicates.go
+++ b/resource-manager/keyvault/2022-11-01/secrets/predicates.go
@@ -12,19 +12,19 @@ type SecretOperationPredicate struct {
 
 func (p SecretOperationPredicate) Matches(input Secret) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/keyvault/2022-11-01/vaults/predicates.go b/resource-manager/keyvault/2022-11-01/vaults/predicates.go
index 5915479bd9d..ded74b94926 100644
--- a/resource-manager/keyvault/2022-11-01/vaults/predicates.go
+++ b/resource-manager/keyvault/2022-11-01/vaults/predicates.go
@@ -11,15 +11,15 @@ type DeletedVaultOperationPredicate struct {
 
 func (p DeletedVaultOperationPredicate) Matches(input DeletedVault) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -35,19 +35,19 @@ type ResourceOperationPredicate struct {
 
 func (p ResourceOperationPredicate) Matches(input Resource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -63,19 +63,19 @@ type VaultOperationPredicate struct {
 
 func (p VaultOperationPredicate) Matches(input Vault) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/keyvault/2023-02-01/keys/predicates.go b/resource-manager/keyvault/2023-02-01/keys/predicates.go
index a63cab4f99c..d7bea89219a 100644
--- a/resource-manager/keyvault/2023-02-01/keys/predicates.go
+++ b/resource-manager/keyvault/2023-02-01/keys/predicates.go
@@ -12,19 +12,19 @@ type KeyOperationPredicate struct {
 
 func (p KeyOperationPredicate) Matches(input Key) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/keyvault/2023-02-01/managedhsmkeys/predicates.go b/resource-manager/keyvault/2023-02-01/managedhsmkeys/predicates.go
index 67684be9770..ed22e02a4b0 100644
--- a/resource-manager/keyvault/2023-02-01/managedhsmkeys/predicates.go
+++ b/resource-manager/keyvault/2023-02-01/managedhsmkeys/predicates.go
@@ -11,15 +11,15 @@ type ManagedHsmKeyOperationPredicate struct {
 
 func (p ManagedHsmKeyOperationPredicate) Matches(input ManagedHsmKey) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/keyvault/2023-02-01/managedhsms/predicates.go b/resource-manager/keyvault/2023-02-01/managedhsms/predicates.go
index 0f74ecc37d8..598d2e6d12b 100644
--- a/resource-manager/keyvault/2023-02-01/managedhsms/predicates.go
+++ b/resource-manager/keyvault/2023-02-01/managedhsms/predicates.go
@@ -11,15 +11,15 @@ type DeletedManagedHsmOperationPredicate struct {
 
 func (p DeletedManagedHsmOperationPredicate) Matches(input DeletedManagedHsm) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -35,19 +35,19 @@ type ManagedHsmOperationPredicate struct {
 
 func (p ManagedHsmOperationPredicate) Matches(input ManagedHsm) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/keyvault/2023-02-01/mhsmlistprivateendpointconnections/predicates.go b/resource-manager/keyvault/2023-02-01/mhsmlistprivateendpointconnections/predicates.go
index 3bc6fdbd558..18e2f2156a7 100644
--- a/resource-manager/keyvault/2023-02-01/mhsmlistprivateendpointconnections/predicates.go
+++ b/resource-manager/keyvault/2023-02-01/mhsmlistprivateendpointconnections/predicates.go
@@ -13,23 +13,23 @@ type MHSMPrivateEndpointConnectionOperationPredicate struct {
 
 func (p MHSMPrivateEndpointConnectionOperationPredicate) Matches(input MHSMPrivateEndpointConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/keyvault/2023-02-01/mhsmlistregions/predicates.go b/resource-manager/keyvault/2023-02-01/mhsmlistregions/predicates.go
index 02e84c642bb..ae0da984504 100644
--- a/resource-manager/keyvault/2023-02-01/mhsmlistregions/predicates.go
+++ b/resource-manager/keyvault/2023-02-01/mhsmlistregions/predicates.go
@@ -10,11 +10,11 @@ type MHSMGeoReplicatedRegionOperationPredicate struct {
 
 func (p MHSMGeoReplicatedRegionOperationPredicate) Matches(input MHSMGeoReplicatedRegion) bool {
 
-	if p.IsPrimary != nil && (input.IsPrimary == nil && *p.IsPrimary != *input.IsPrimary) {
+	if p.IsPrimary != nil && (input.IsPrimary == nil || *p.IsPrimary != *input.IsPrimary) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/keyvault/2023-02-01/privateendpointconnections/predicates.go b/resource-manager/keyvault/2023-02-01/privateendpointconnections/predicates.go
index 8a981bfd857..accb20a0cc4 100644
--- a/resource-manager/keyvault/2023-02-01/privateendpointconnections/predicates.go
+++ b/resource-manager/keyvault/2023-02-01/privateendpointconnections/predicates.go
@@ -13,23 +13,23 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/keyvault/2023-02-01/secrets/predicates.go b/resource-manager/keyvault/2023-02-01/secrets/predicates.go
index 9d694420242..1eb8d4feaa8 100644
--- a/resource-manager/keyvault/2023-02-01/secrets/predicates.go
+++ b/resource-manager/keyvault/2023-02-01/secrets/predicates.go
@@ -12,19 +12,19 @@ type SecretOperationPredicate struct {
 
 func (p SecretOperationPredicate) Matches(input Secret) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/keyvault/2023-02-01/vaults/predicates.go b/resource-manager/keyvault/2023-02-01/vaults/predicates.go
index 5915479bd9d..ded74b94926 100644
--- a/resource-manager/keyvault/2023-02-01/vaults/predicates.go
+++ b/resource-manager/keyvault/2023-02-01/vaults/predicates.go
@@ -11,15 +11,15 @@ type DeletedVaultOperationPredicate struct {
 
 func (p DeletedVaultOperationPredicate) Matches(input DeletedVault) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -35,19 +35,19 @@ type ResourceOperationPredicate struct {
 
 func (p ResourceOperationPredicate) Matches(input Resource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -63,19 +63,19 @@ type VaultOperationPredicate struct {
 
 func (p VaultOperationPredicate) Matches(input Vault) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/kubernetesconfiguration/2022-03-01/clusterextensions/predicates.go b/resource-manager/kubernetesconfiguration/2022-03-01/clusterextensions/predicates.go
index e057fd28450..1ddaf4e58fe 100644
--- a/resource-manager/kubernetesconfiguration/2022-03-01/clusterextensions/predicates.go
+++ b/resource-manager/kubernetesconfiguration/2022-03-01/clusterextensions/predicates.go
@@ -11,15 +11,15 @@ type ExtensionOperationPredicate struct {
 
 func (p ExtensionOperationPredicate) Matches(input Extension) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/kubernetesconfiguration/2022-03-01/extensions/predicates.go b/resource-manager/kubernetesconfiguration/2022-03-01/extensions/predicates.go
index d8252ea6286..41d2fee4d9b 100644
--- a/resource-manager/kubernetesconfiguration/2022-03-01/extensions/predicates.go
+++ b/resource-manager/kubernetesconfiguration/2022-03-01/extensions/predicates.go
@@ -11,15 +11,15 @@ type ExtensionOperationPredicate struct {
 
 func (p ExtensionOperationPredicate) Matches(input Extension) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/kubernetesconfiguration/2022-03-01/flux/predicates.go b/resource-manager/kubernetesconfiguration/2022-03-01/flux/predicates.go
index 6aec6a913dd..54dfb4c2d8c 100644
--- a/resource-manager/kubernetesconfiguration/2022-03-01/flux/predicates.go
+++ b/resource-manager/kubernetesconfiguration/2022-03-01/flux/predicates.go
@@ -11,15 +11,15 @@ type FluxConfigurationOperationPredicate struct {
 
 func (p FluxConfigurationOperationPredicate) Matches(input FluxConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/kubernetesconfiguration/2022-03-01/fluxconfiguration/predicates.go b/resource-manager/kubernetesconfiguration/2022-03-01/fluxconfiguration/predicates.go
index 170aede1bba..726a4ce8788 100644
--- a/resource-manager/kubernetesconfiguration/2022-03-01/fluxconfiguration/predicates.go
+++ b/resource-manager/kubernetesconfiguration/2022-03-01/fluxconfiguration/predicates.go
@@ -11,15 +11,15 @@ type FluxConfigurationOperationPredicate struct {
 
 func (p FluxConfigurationOperationPredicate) Matches(input FluxConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/kubernetesconfiguration/2022-03-01/operationsinacluster/predicates.go b/resource-manager/kubernetesconfiguration/2022-03-01/operationsinacluster/predicates.go
index 3c8accf5d8e..2b12fb09288 100644
--- a/resource-manager/kubernetesconfiguration/2022-03-01/operationsinacluster/predicates.go
+++ b/resource-manager/kubernetesconfiguration/2022-03-01/operationsinacluster/predicates.go
@@ -11,11 +11,11 @@ type OperationStatusResultOperationPredicate struct {
 
 func (p OperationStatusResultOperationPredicate) Matches(input OperationStatusResult) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/kubernetesconfiguration/2022-03-01/sourcecontrolconfiguration/predicates.go b/resource-manager/kubernetesconfiguration/2022-03-01/sourcecontrolconfiguration/predicates.go
index fbb3eff58ef..8d35e4a34d4 100644
--- a/resource-manager/kubernetesconfiguration/2022-03-01/sourcecontrolconfiguration/predicates.go
+++ b/resource-manager/kubernetesconfiguration/2022-03-01/sourcecontrolconfiguration/predicates.go
@@ -11,15 +11,15 @@ type SourceControlConfigurationOperationPredicate struct {
 
 func (p SourceControlConfigurationOperationPredicate) Matches(input SourceControlConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/kubernetesconfiguration/2022-11-01/clusterextensions/predicates.go b/resource-manager/kubernetesconfiguration/2022-11-01/clusterextensions/predicates.go
index e057fd28450..1ddaf4e58fe 100644
--- a/resource-manager/kubernetesconfiguration/2022-11-01/clusterextensions/predicates.go
+++ b/resource-manager/kubernetesconfiguration/2022-11-01/clusterextensions/predicates.go
@@ -11,15 +11,15 @@ type ExtensionOperationPredicate struct {
 
 func (p ExtensionOperationPredicate) Matches(input Extension) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/kubernetesconfiguration/2022-11-01/extensions/predicates.go b/resource-manager/kubernetesconfiguration/2022-11-01/extensions/predicates.go
index d8252ea6286..41d2fee4d9b 100644
--- a/resource-manager/kubernetesconfiguration/2022-11-01/extensions/predicates.go
+++ b/resource-manager/kubernetesconfiguration/2022-11-01/extensions/predicates.go
@@ -11,15 +11,15 @@ type ExtensionOperationPredicate struct {
 
 func (p ExtensionOperationPredicate) Matches(input Extension) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/kubernetesconfiguration/2022-11-01/flux/predicates.go b/resource-manager/kubernetesconfiguration/2022-11-01/flux/predicates.go
index 6aec6a913dd..54dfb4c2d8c 100644
--- a/resource-manager/kubernetesconfiguration/2022-11-01/flux/predicates.go
+++ b/resource-manager/kubernetesconfiguration/2022-11-01/flux/predicates.go
@@ -11,15 +11,15 @@ type FluxConfigurationOperationPredicate struct {
 
 func (p FluxConfigurationOperationPredicate) Matches(input FluxConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/kubernetesconfiguration/2022-11-01/fluxconfiguration/predicates.go b/resource-manager/kubernetesconfiguration/2022-11-01/fluxconfiguration/predicates.go
index 170aede1bba..726a4ce8788 100644
--- a/resource-manager/kubernetesconfiguration/2022-11-01/fluxconfiguration/predicates.go
+++ b/resource-manager/kubernetesconfiguration/2022-11-01/fluxconfiguration/predicates.go
@@ -11,15 +11,15 @@ type FluxConfigurationOperationPredicate struct {
 
 func (p FluxConfigurationOperationPredicate) Matches(input FluxConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/kubernetesconfiguration/2022-11-01/operationsinacluster/predicates.go b/resource-manager/kubernetesconfiguration/2022-11-01/operationsinacluster/predicates.go
index 3c8accf5d8e..2b12fb09288 100644
--- a/resource-manager/kubernetesconfiguration/2022-11-01/operationsinacluster/predicates.go
+++ b/resource-manager/kubernetesconfiguration/2022-11-01/operationsinacluster/predicates.go
@@ -11,11 +11,11 @@ type OperationStatusResultOperationPredicate struct {
 
 func (p OperationStatusResultOperationPredicate) Matches(input OperationStatusResult) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/kubernetesconfiguration/2022-11-01/sourcecontrolconfiguration/predicates.go b/resource-manager/kubernetesconfiguration/2022-11-01/sourcecontrolconfiguration/predicates.go
index fbb3eff58ef..8d35e4a34d4 100644
--- a/resource-manager/kubernetesconfiguration/2022-11-01/sourcecontrolconfiguration/predicates.go
+++ b/resource-manager/kubernetesconfiguration/2022-11-01/sourcecontrolconfiguration/predicates.go
@@ -11,15 +11,15 @@ type SourceControlConfigurationOperationPredicate struct {
 
 func (p SourceControlConfigurationOperationPredicate) Matches(input SourceControlConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/kubernetesconfiguration/2023-05-01/clusterextensions/predicates.go b/resource-manager/kubernetesconfiguration/2023-05-01/clusterextensions/predicates.go
index e057fd28450..1ddaf4e58fe 100644
--- a/resource-manager/kubernetesconfiguration/2023-05-01/clusterextensions/predicates.go
+++ b/resource-manager/kubernetesconfiguration/2023-05-01/clusterextensions/predicates.go
@@ -11,15 +11,15 @@ type ExtensionOperationPredicate struct {
 
 func (p ExtensionOperationPredicate) Matches(input Extension) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/kubernetesconfiguration/2023-05-01/extensions/predicates.go b/resource-manager/kubernetesconfiguration/2023-05-01/extensions/predicates.go
index d8252ea6286..41d2fee4d9b 100644
--- a/resource-manager/kubernetesconfiguration/2023-05-01/extensions/predicates.go
+++ b/resource-manager/kubernetesconfiguration/2023-05-01/extensions/predicates.go
@@ -11,15 +11,15 @@ type ExtensionOperationPredicate struct {
 
 func (p ExtensionOperationPredicate) Matches(input Extension) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/kubernetesconfiguration/2023-05-01/flux/predicates.go b/resource-manager/kubernetesconfiguration/2023-05-01/flux/predicates.go
index 6aec6a913dd..54dfb4c2d8c 100644
--- a/resource-manager/kubernetesconfiguration/2023-05-01/flux/predicates.go
+++ b/resource-manager/kubernetesconfiguration/2023-05-01/flux/predicates.go
@@ -11,15 +11,15 @@ type FluxConfigurationOperationPredicate struct {
 
 func (p FluxConfigurationOperationPredicate) Matches(input FluxConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/kubernetesconfiguration/2023-05-01/fluxconfiguration/predicates.go b/resource-manager/kubernetesconfiguration/2023-05-01/fluxconfiguration/predicates.go
index 170aede1bba..726a4ce8788 100644
--- a/resource-manager/kubernetesconfiguration/2023-05-01/fluxconfiguration/predicates.go
+++ b/resource-manager/kubernetesconfiguration/2023-05-01/fluxconfiguration/predicates.go
@@ -11,15 +11,15 @@ type FluxConfigurationOperationPredicate struct {
 
 func (p FluxConfigurationOperationPredicate) Matches(input FluxConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/kubernetesconfiguration/2023-05-01/operationsinacluster/predicates.go b/resource-manager/kubernetesconfiguration/2023-05-01/operationsinacluster/predicates.go
index 3c8accf5d8e..2b12fb09288 100644
--- a/resource-manager/kubernetesconfiguration/2023-05-01/operationsinacluster/predicates.go
+++ b/resource-manager/kubernetesconfiguration/2023-05-01/operationsinacluster/predicates.go
@@ -11,11 +11,11 @@ type OperationStatusResultOperationPredicate struct {
 
 func (p OperationStatusResultOperationPredicate) Matches(input OperationStatusResult) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/kubernetesconfiguration/2023-05-01/sourcecontrolconfiguration/predicates.go b/resource-manager/kubernetesconfiguration/2023-05-01/sourcecontrolconfiguration/predicates.go
index fbb3eff58ef..8d35e4a34d4 100644
--- a/resource-manager/kubernetesconfiguration/2023-05-01/sourcecontrolconfiguration/predicates.go
+++ b/resource-manager/kubernetesconfiguration/2023-05-01/sourcecontrolconfiguration/predicates.go
@@ -11,15 +11,15 @@ type SourceControlConfigurationOperationPredicate struct {
 
 func (p SourceControlConfigurationOperationPredicate) Matches(input SourceControlConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/kusto/2023-05-02/outboundnetworkdependenciesendpoints/predicates.go b/resource-manager/kusto/2023-05-02/outboundnetworkdependenciesendpoints/predicates.go
index 48ee2ee1edd..95ea4de4061 100644
--- a/resource-manager/kusto/2023-05-02/outboundnetworkdependenciesendpoints/predicates.go
+++ b/resource-manager/kusto/2023-05-02/outboundnetworkdependenciesendpoints/predicates.go
@@ -12,19 +12,19 @@ type OutboundNetworkDependenciesEndpointOperationPredicate struct {
 
 func (p OutboundNetworkDependenciesEndpointOperationPredicate) Matches(input OutboundNetworkDependenciesEndpoint) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/labservices/2021-10-01-preview/image/predicates.go b/resource-manager/labservices/2021-10-01-preview/image/predicates.go
index 691a166c41e..9b67b8bdf94 100644
--- a/resource-manager/labservices/2021-10-01-preview/image/predicates.go
+++ b/resource-manager/labservices/2021-10-01-preview/image/predicates.go
@@ -11,15 +11,15 @@ type ImageOperationPredicate struct {
 
 func (p ImageOperationPredicate) Matches(input Image) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/labservices/2021-10-01-preview/lab/predicates.go b/resource-manager/labservices/2021-10-01-preview/lab/predicates.go
index 35a34c039ab..ddf1b2a81d8 100644
--- a/resource-manager/labservices/2021-10-01-preview/lab/predicates.go
+++ b/resource-manager/labservices/2021-10-01-preview/lab/predicates.go
@@ -12,7 +12,7 @@ type LabOperationPredicate struct {
 
 func (p LabOperationPredicate) Matches(input Lab) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p LabOperationPredicate) Matches(input Lab) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/labservices/2021-10-01-preview/labplan/predicates.go b/resource-manager/labservices/2021-10-01-preview/labplan/predicates.go
index 635b3da73a6..74f89d0968a 100644
--- a/resource-manager/labservices/2021-10-01-preview/labplan/predicates.go
+++ b/resource-manager/labservices/2021-10-01-preview/labplan/predicates.go
@@ -12,7 +12,7 @@ type LabPlanOperationPredicate struct {
 
 func (p LabPlanOperationPredicate) Matches(input LabPlan) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p LabPlanOperationPredicate) Matches(input LabPlan) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/labservices/2021-10-01-preview/schedule/predicates.go b/resource-manager/labservices/2021-10-01-preview/schedule/predicates.go
index 429a38a6a3c..77fa3780f49 100644
--- a/resource-manager/labservices/2021-10-01-preview/schedule/predicates.go
+++ b/resource-manager/labservices/2021-10-01-preview/schedule/predicates.go
@@ -11,15 +11,15 @@ type ScheduleOperationPredicate struct {
 
 func (p ScheduleOperationPredicate) Matches(input Schedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/labservices/2021-10-01-preview/user/predicates.go b/resource-manager/labservices/2021-10-01-preview/user/predicates.go
index ab568963538..6af39b3985a 100644
--- a/resource-manager/labservices/2021-10-01-preview/user/predicates.go
+++ b/resource-manager/labservices/2021-10-01-preview/user/predicates.go
@@ -11,15 +11,15 @@ type UserOperationPredicate struct {
 
 func (p UserOperationPredicate) Matches(input User) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/labservices/2021-10-01-preview/virtualmachine/predicates.go b/resource-manager/labservices/2021-10-01-preview/virtualmachine/predicates.go
index cdea2a8f5de..ebb8cbbc98d 100644
--- a/resource-manager/labservices/2021-10-01-preview/virtualmachine/predicates.go
+++ b/resource-manager/labservices/2021-10-01-preview/virtualmachine/predicates.go
@@ -11,15 +11,15 @@ type VirtualMachineOperationPredicate struct {
 
 func (p VirtualMachineOperationPredicate) Matches(input VirtualMachine) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/labservices/2022-08-01/image/predicates.go b/resource-manager/labservices/2022-08-01/image/predicates.go
index 691a166c41e..9b67b8bdf94 100644
--- a/resource-manager/labservices/2022-08-01/image/predicates.go
+++ b/resource-manager/labservices/2022-08-01/image/predicates.go
@@ -11,15 +11,15 @@ type ImageOperationPredicate struct {
 
 func (p ImageOperationPredicate) Matches(input Image) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/labservices/2022-08-01/lab/predicates.go b/resource-manager/labservices/2022-08-01/lab/predicates.go
index 35a34c039ab..ddf1b2a81d8 100644
--- a/resource-manager/labservices/2022-08-01/lab/predicates.go
+++ b/resource-manager/labservices/2022-08-01/lab/predicates.go
@@ -12,7 +12,7 @@ type LabOperationPredicate struct {
 
 func (p LabOperationPredicate) Matches(input Lab) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p LabOperationPredicate) Matches(input Lab) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/labservices/2022-08-01/labplan/predicates.go b/resource-manager/labservices/2022-08-01/labplan/predicates.go
index 635b3da73a6..74f89d0968a 100644
--- a/resource-manager/labservices/2022-08-01/labplan/predicates.go
+++ b/resource-manager/labservices/2022-08-01/labplan/predicates.go
@@ -12,7 +12,7 @@ type LabPlanOperationPredicate struct {
 
 func (p LabPlanOperationPredicate) Matches(input LabPlan) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p LabPlanOperationPredicate) Matches(input LabPlan) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/labservices/2022-08-01/schedule/predicates.go b/resource-manager/labservices/2022-08-01/schedule/predicates.go
index 429a38a6a3c..77fa3780f49 100644
--- a/resource-manager/labservices/2022-08-01/schedule/predicates.go
+++ b/resource-manager/labservices/2022-08-01/schedule/predicates.go
@@ -11,15 +11,15 @@ type ScheduleOperationPredicate struct {
 
 func (p ScheduleOperationPredicate) Matches(input Schedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/labservices/2022-08-01/skus/predicates.go b/resource-manager/labservices/2022-08-01/skus/predicates.go
index 51764f23088..0d71c9e37db 100644
--- a/resource-manager/labservices/2022-08-01/skus/predicates.go
+++ b/resource-manager/labservices/2022-08-01/skus/predicates.go
@@ -12,19 +12,19 @@ type LabServicesSkuOperationPredicate struct {
 
 func (p LabServicesSkuOperationPredicate) Matches(input LabServicesSku) bool {
 
-	if p.Family != nil && (input.Family == nil && *p.Family != *input.Family) {
+	if p.Family != nil && (input.Family == nil || *p.Family != *input.Family) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
-	if p.Size != nil && (input.Size == nil && *p.Size != *input.Size) {
+	if p.Size != nil && (input.Size == nil || *p.Size != *input.Size) {
 		return false
 	}
 
diff --git a/resource-manager/labservices/2022-08-01/usages/predicates.go b/resource-manager/labservices/2022-08-01/usages/predicates.go
index eb27a9d7786..902c6beeb85 100644
--- a/resource-manager/labservices/2022-08-01/usages/predicates.go
+++ b/resource-manager/labservices/2022-08-01/usages/predicates.go
@@ -11,15 +11,15 @@ type UsageOperationPredicate struct {
 
 func (p UsageOperationPredicate) Matches(input Usage) bool {
 
-	if p.CurrentValue != nil && (input.CurrentValue == nil && *p.CurrentValue != *input.CurrentValue) {
+	if p.CurrentValue != nil && (input.CurrentValue == nil || *p.CurrentValue != *input.CurrentValue) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
diff --git a/resource-manager/labservices/2022-08-01/user/predicates.go b/resource-manager/labservices/2022-08-01/user/predicates.go
index ab568963538..6af39b3985a 100644
--- a/resource-manager/labservices/2022-08-01/user/predicates.go
+++ b/resource-manager/labservices/2022-08-01/user/predicates.go
@@ -11,15 +11,15 @@ type UserOperationPredicate struct {
 
 func (p UserOperationPredicate) Matches(input User) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/labservices/2022-08-01/virtualmachine/predicates.go b/resource-manager/labservices/2022-08-01/virtualmachine/predicates.go
index cdea2a8f5de..ebb8cbbc98d 100644
--- a/resource-manager/labservices/2022-08-01/virtualmachine/predicates.go
+++ b/resource-manager/labservices/2022-08-01/virtualmachine/predicates.go
@@ -11,15 +11,15 @@ type VirtualMachineOperationPredicate struct {
 
 func (p VirtualMachineOperationPredicate) Matches(input VirtualMachine) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/loadtestservice/2022-12-01/loadtest/predicates.go b/resource-manager/loadtestservice/2022-12-01/loadtest/predicates.go
index af40166ec19..e973f1c4554 100644
--- a/resource-manager/loadtestservice/2022-12-01/loadtest/predicates.go
+++ b/resource-manager/loadtestservice/2022-12-01/loadtest/predicates.go
@@ -9,7 +9,7 @@ type OutboundEnvironmentEndpointOperationPredicate struct {
 
 func (p OutboundEnvironmentEndpointOperationPredicate) Matches(input OutboundEnvironmentEndpoint) bool {
 
-	if p.Category != nil && (input.Category == nil && *p.Category != *input.Category) {
+	if p.Category != nil && (input.Category == nil || *p.Category != *input.Category) {
 		return false
 	}
 
diff --git a/resource-manager/loadtestservice/2022-12-01/loadtests/predicates.go b/resource-manager/loadtestservice/2022-12-01/loadtests/predicates.go
index 9ed7ceaf9e6..da056c9b937 100644
--- a/resource-manager/loadtestservice/2022-12-01/loadtests/predicates.go
+++ b/resource-manager/loadtestservice/2022-12-01/loadtests/predicates.go
@@ -12,7 +12,7 @@ type LoadTestResourceOperationPredicate struct {
 
 func (p LoadTestResourceOperationPredicate) Matches(input LoadTestResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p LoadTestResourceOperationPredicate) Matches(input LoadTestResource) bool
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/loadtestservice/2022-12-01/quotas/predicates.go b/resource-manager/loadtestservice/2022-12-01/quotas/predicates.go
index 9a85e1d6e79..09a5a1d6aec 100644
--- a/resource-manager/loadtestservice/2022-12-01/quotas/predicates.go
+++ b/resource-manager/loadtestservice/2022-12-01/quotas/predicates.go
@@ -11,15 +11,15 @@ type QuotaResourceOperationPredicate struct {
 
 func (p QuotaResourceOperationPredicate) Matches(input QuotaResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/logic/2019-05-01/integrationaccountagreements/predicates.go b/resource-manager/logic/2019-05-01/integrationaccountagreements/predicates.go
index 3f0958dcde0..416522d7ae4 100644
--- a/resource-manager/logic/2019-05-01/integrationaccountagreements/predicates.go
+++ b/resource-manager/logic/2019-05-01/integrationaccountagreements/predicates.go
@@ -12,19 +12,19 @@ type IntegrationAccountAgreementOperationPredicate struct {
 
 func (p IntegrationAccountAgreementOperationPredicate) Matches(input IntegrationAccountAgreement) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/logic/2019-05-01/integrationaccountcertificates/predicates.go b/resource-manager/logic/2019-05-01/integrationaccountcertificates/predicates.go
index f68a8ee0c94..199a90a90e6 100644
--- a/resource-manager/logic/2019-05-01/integrationaccountcertificates/predicates.go
+++ b/resource-manager/logic/2019-05-01/integrationaccountcertificates/predicates.go
@@ -12,19 +12,19 @@ type IntegrationAccountCertificateOperationPredicate struct {
 
 func (p IntegrationAccountCertificateOperationPredicate) Matches(input IntegrationAccountCertificate) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/logic/2019-05-01/integrationaccountmaps/predicates.go b/resource-manager/logic/2019-05-01/integrationaccountmaps/predicates.go
index 3bea4f01a47..6c036a66406 100644
--- a/resource-manager/logic/2019-05-01/integrationaccountmaps/predicates.go
+++ b/resource-manager/logic/2019-05-01/integrationaccountmaps/predicates.go
@@ -12,19 +12,19 @@ type IntegrationAccountMapOperationPredicate struct {
 
 func (p IntegrationAccountMapOperationPredicate) Matches(input IntegrationAccountMap) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/logic/2019-05-01/integrationaccountpartners/predicates.go b/resource-manager/logic/2019-05-01/integrationaccountpartners/predicates.go
index 60fe202b747..5033dd78ec5 100644
--- a/resource-manager/logic/2019-05-01/integrationaccountpartners/predicates.go
+++ b/resource-manager/logic/2019-05-01/integrationaccountpartners/predicates.go
@@ -12,19 +12,19 @@ type IntegrationAccountPartnerOperationPredicate struct {
 
 func (p IntegrationAccountPartnerOperationPredicate) Matches(input IntegrationAccountPartner) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/logic/2019-05-01/integrationaccounts/predicates.go b/resource-manager/logic/2019-05-01/integrationaccounts/predicates.go
index 2ff45fefb7a..484c1201caf 100644
--- a/resource-manager/logic/2019-05-01/integrationaccounts/predicates.go
+++ b/resource-manager/logic/2019-05-01/integrationaccounts/predicates.go
@@ -12,19 +12,19 @@ type IntegrationAccountOperationPredicate struct {
 
 func (p IntegrationAccountOperationPredicate) Matches(input IntegrationAccount) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/logic/2019-05-01/integrationaccountschemas/predicates.go b/resource-manager/logic/2019-05-01/integrationaccountschemas/predicates.go
index 1a420d3864a..c930cf7f30b 100644
--- a/resource-manager/logic/2019-05-01/integrationaccountschemas/predicates.go
+++ b/resource-manager/logic/2019-05-01/integrationaccountschemas/predicates.go
@@ -12,19 +12,19 @@ type IntegrationAccountSchemaOperationPredicate struct {
 
 func (p IntegrationAccountSchemaOperationPredicate) Matches(input IntegrationAccountSchema) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/logic/2019-05-01/integrationaccountsessions/predicates.go b/resource-manager/logic/2019-05-01/integrationaccountsessions/predicates.go
index 027023375a5..1106b1980a1 100644
--- a/resource-manager/logic/2019-05-01/integrationaccountsessions/predicates.go
+++ b/resource-manager/logic/2019-05-01/integrationaccountsessions/predicates.go
@@ -12,19 +12,19 @@ type IntegrationAccountSessionOperationPredicate struct {
 
 func (p IntegrationAccountSessionOperationPredicate) Matches(input IntegrationAccountSession) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/logic/2019-05-01/integrationserviceenvironmentmanagedapis/predicates.go b/resource-manager/logic/2019-05-01/integrationserviceenvironmentmanagedapis/predicates.go
index e9cfc5d5c3e..027ccab0edf 100644
--- a/resource-manager/logic/2019-05-01/integrationserviceenvironmentmanagedapis/predicates.go
+++ b/resource-manager/logic/2019-05-01/integrationserviceenvironmentmanagedapis/predicates.go
@@ -12,19 +12,19 @@ type ApiOperationOperationPredicate struct {
 
 func (p ApiOperationOperationPredicate) Matches(input ApiOperation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,19 +40,19 @@ type IntegrationServiceEnvironmentManagedApiOperationPredicate struct {
 
 func (p IntegrationServiceEnvironmentManagedApiOperationPredicate) Matches(input IntegrationServiceEnvironmentManagedApi) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/logic/2019-05-01/integrationserviceenvironments/predicates.go b/resource-manager/logic/2019-05-01/integrationserviceenvironments/predicates.go
index 70c6aaa2fa8..b179d823663 100644
--- a/resource-manager/logic/2019-05-01/integrationserviceenvironments/predicates.go
+++ b/resource-manager/logic/2019-05-01/integrationserviceenvironments/predicates.go
@@ -12,19 +12,19 @@ type IntegrationServiceEnvironmentOperationPredicate struct {
 
 func (p IntegrationServiceEnvironmentOperationPredicate) Matches(input IntegrationServiceEnvironment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/logic/2019-05-01/integrationserviceenvironmentskus/predicates.go b/resource-manager/logic/2019-05-01/integrationserviceenvironmentskus/predicates.go
index ebb68f9dcc1..5b8d23b4fe4 100644
--- a/resource-manager/logic/2019-05-01/integrationserviceenvironmentskus/predicates.go
+++ b/resource-manager/logic/2019-05-01/integrationserviceenvironmentskus/predicates.go
@@ -9,7 +9,7 @@ type IntegrationServiceEnvironmentSkuDefinitionOperationPredicate struct {
 
 func (p IntegrationServiceEnvironmentSkuDefinitionOperationPredicate) Matches(input IntegrationServiceEnvironmentSkuDefinition) bool {
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
diff --git a/resource-manager/logic/2019-05-01/workflowrunactions/predicates.go b/resource-manager/logic/2019-05-01/workflowrunactions/predicates.go
index 4550e8346e3..f5d86e4f513 100644
--- a/resource-manager/logic/2019-05-01/workflowrunactions/predicates.go
+++ b/resource-manager/logic/2019-05-01/workflowrunactions/predicates.go
@@ -12,19 +12,19 @@ type RequestHistoryOperationPredicate struct {
 
 func (p RequestHistoryOperationPredicate) Matches(input RequestHistory) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -39,15 +39,15 @@ type WorkflowRunActionOperationPredicate struct {
 
 func (p WorkflowRunActionOperationPredicate) Matches(input WorkflowRunAction) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/logic/2019-05-01/workflowruns/predicates.go b/resource-manager/logic/2019-05-01/workflowruns/predicates.go
index b34d03ade8c..ad76dae5873 100644
--- a/resource-manager/logic/2019-05-01/workflowruns/predicates.go
+++ b/resource-manager/logic/2019-05-01/workflowruns/predicates.go
@@ -11,15 +11,15 @@ type WorkflowRunOperationPredicate struct {
 
 func (p WorkflowRunOperationPredicate) Matches(input WorkflowRun) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/logic/2019-05-01/workflows/predicates.go b/resource-manager/logic/2019-05-01/workflows/predicates.go
index 8beba227333..3d2b6a5c060 100644
--- a/resource-manager/logic/2019-05-01/workflows/predicates.go
+++ b/resource-manager/logic/2019-05-01/workflows/predicates.go
@@ -12,19 +12,19 @@ type WorkflowOperationPredicate struct {
 
 func (p WorkflowOperationPredicate) Matches(input Workflow) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/logic/2019-05-01/workflowtriggerhistories/predicates.go b/resource-manager/logic/2019-05-01/workflowtriggerhistories/predicates.go
index 124734e290f..20fca9c869f 100644
--- a/resource-manager/logic/2019-05-01/workflowtriggerhistories/predicates.go
+++ b/resource-manager/logic/2019-05-01/workflowtriggerhistories/predicates.go
@@ -11,15 +11,15 @@ type WorkflowTriggerHistoryOperationPredicate struct {
 
 func (p WorkflowTriggerHistoryOperationPredicate) Matches(input WorkflowTriggerHistory) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/logic/2019-05-01/workflowtriggers/predicates.go b/resource-manager/logic/2019-05-01/workflowtriggers/predicates.go
index 16d7ba4c45e..724f6388737 100644
--- a/resource-manager/logic/2019-05-01/workflowtriggers/predicates.go
+++ b/resource-manager/logic/2019-05-01/workflowtriggers/predicates.go
@@ -11,15 +11,15 @@ type WorkflowTriggerOperationPredicate struct {
 
 func (p WorkflowTriggerOperationPredicate) Matches(input WorkflowTrigger) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/logic/2019-05-01/workflowversions/predicates.go b/resource-manager/logic/2019-05-01/workflowversions/predicates.go
index 25b691071af..1458230244b 100644
--- a/resource-manager/logic/2019-05-01/workflowversions/predicates.go
+++ b/resource-manager/logic/2019-05-01/workflowversions/predicates.go
@@ -12,19 +12,19 @@ type WorkflowVersionOperationPredicate struct {
 
 func (p WorkflowVersionOperationPredicate) Matches(input WorkflowVersion) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/logz/2020-10-01/monitors/predicates.go b/resource-manager/logz/2020-10-01/monitors/predicates.go
index 81111852619..c717fd40c26 100644
--- a/resource-manager/logz/2020-10-01/monitors/predicates.go
+++ b/resource-manager/logz/2020-10-01/monitors/predicates.go
@@ -12,7 +12,7 @@ type LogzMonitorResourceOperationPredicate struct {
 
 func (p LogzMonitorResourceOperationPredicate) Matches(input LogzMonitorResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p LogzMonitorResourceOperationPredicate) Matches(input LogzMonitorResource
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -41,23 +41,23 @@ type MonitoredResourceOperationPredicate struct {
 
 func (p MonitoredResourceOperationPredicate) Matches(input MonitoredResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.ReasonForLogsStatus != nil && (input.ReasonForLogsStatus == nil && *p.ReasonForLogsStatus != *input.ReasonForLogsStatus) {
+	if p.ReasonForLogsStatus != nil && (input.ReasonForLogsStatus == nil || *p.ReasonForLogsStatus != *input.ReasonForLogsStatus) {
 		return false
 	}
 
-	if p.ReasonForMetricsStatus != nil && (input.ReasonForMetricsStatus == nil && *p.ReasonForMetricsStatus != *input.ReasonForMetricsStatus) {
+	if p.ReasonForMetricsStatus != nil && (input.ReasonForMetricsStatus == nil || *p.ReasonForMetricsStatus != *input.ReasonForMetricsStatus) {
 		return false
 	}
 
-	if p.SendingLogs != nil && (input.SendingLogs == nil && *p.SendingLogs != *input.SendingLogs) {
+	if p.SendingLogs != nil && (input.SendingLogs == nil || *p.SendingLogs != *input.SendingLogs) {
 		return false
 	}
 
-	if p.SendingMetrics != nil && (input.SendingMetrics == nil && *p.SendingMetrics != *input.SendingMetrics) {
+	if p.SendingMetrics != nil && (input.SendingMetrics == nil || *p.SendingMetrics != *input.SendingMetrics) {
 		return false
 	}
 
diff --git a/resource-manager/logz/2020-10-01/singlesignon/predicates.go b/resource-manager/logz/2020-10-01/singlesignon/predicates.go
index 669662a626b..74f004e69f8 100644
--- a/resource-manager/logz/2020-10-01/singlesignon/predicates.go
+++ b/resource-manager/logz/2020-10-01/singlesignon/predicates.go
@@ -11,15 +11,15 @@ type LogzSingleSignOnResourceOperationPredicate struct {
 
 func (p LogzSingleSignOnResourceOperationPredicate) Matches(input LogzSingleSignOnResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/logz/2020-10-01/subaccount/predicates.go b/resource-manager/logz/2020-10-01/subaccount/predicates.go
index f9f9ce49e10..70c789ddee2 100644
--- a/resource-manager/logz/2020-10-01/subaccount/predicates.go
+++ b/resource-manager/logz/2020-10-01/subaccount/predicates.go
@@ -12,7 +12,7 @@ type LogzMonitorResourceOperationPredicate struct {
 
 func (p LogzMonitorResourceOperationPredicate) Matches(input LogzMonitorResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p LogzMonitorResourceOperationPredicate) Matches(input LogzMonitorResource
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -41,23 +41,23 @@ type MonitoredResourceOperationPredicate struct {
 
 func (p MonitoredResourceOperationPredicate) Matches(input MonitoredResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.ReasonForLogsStatus != nil && (input.ReasonForLogsStatus == nil && *p.ReasonForLogsStatus != *input.ReasonForLogsStatus) {
+	if p.ReasonForLogsStatus != nil && (input.ReasonForLogsStatus == nil || *p.ReasonForLogsStatus != *input.ReasonForLogsStatus) {
 		return false
 	}
 
-	if p.ReasonForMetricsStatus != nil && (input.ReasonForMetricsStatus == nil && *p.ReasonForMetricsStatus != *input.ReasonForMetricsStatus) {
+	if p.ReasonForMetricsStatus != nil && (input.ReasonForMetricsStatus == nil || *p.ReasonForMetricsStatus != *input.ReasonForMetricsStatus) {
 		return false
 	}
 
-	if p.SendingLogs != nil && (input.SendingLogs == nil && *p.SendingLogs != *input.SendingLogs) {
+	if p.SendingLogs != nil && (input.SendingLogs == nil || *p.SendingLogs != *input.SendingLogs) {
 		return false
 	}
 
-	if p.SendingMetrics != nil && (input.SendingMetrics == nil && *p.SendingMetrics != *input.SendingMetrics) {
+	if p.SendingMetrics != nil && (input.SendingMetrics == nil || *p.SendingMetrics != *input.SendingMetrics) {
 		return false
 	}
 
diff --git a/resource-manager/logz/2020-10-01/tagrules/predicates.go b/resource-manager/logz/2020-10-01/tagrules/predicates.go
index 13590db098c..a75bf2a34b3 100644
--- a/resource-manager/logz/2020-10-01/tagrules/predicates.go
+++ b/resource-manager/logz/2020-10-01/tagrules/predicates.go
@@ -11,15 +11,15 @@ type MonitoringTagRulesOperationPredicate struct {
 
 func (p MonitoringTagRulesOperationPredicate) Matches(input MonitoringTagRules) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/logz/2020-10-01/vmhost/predicates.go b/resource-manager/logz/2020-10-01/vmhost/predicates.go
index a989293d927..1d53ebc8265 100644
--- a/resource-manager/logz/2020-10-01/vmhost/predicates.go
+++ b/resource-manager/logz/2020-10-01/vmhost/predicates.go
@@ -10,11 +10,11 @@ type VMResourcesOperationPredicate struct {
 
 func (p VMResourcesOperationPredicate) Matches(input VMResources) bool {
 
-	if p.AgentVersion != nil && (input.AgentVersion == nil && *p.AgentVersion != *input.AgentVersion) {
+	if p.AgentVersion != nil && (input.AgentVersion == nil || *p.AgentVersion != *input.AgentVersion) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-05-01/batchdeployment/predicates.go b/resource-manager/machinelearningservices/2022-05-01/batchdeployment/predicates.go
index 6244ec731cc..2c12ee7610f 100644
--- a/resource-manager/machinelearningservices/2022-05-01/batchdeployment/predicates.go
+++ b/resource-manager/machinelearningservices/2022-05-01/batchdeployment/predicates.go
@@ -13,11 +13,11 @@ type BatchDeploymentTrackedResourceOperationPredicate struct {
 
 func (p BatchDeploymentTrackedResourceOperationPredicate) Matches(input BatchDeploymentTrackedResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p BatchDeploymentTrackedResourceOperationPredicate) Matches(input BatchDep
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-05-01/batchendpoint/predicates.go b/resource-manager/machinelearningservices/2022-05-01/batchendpoint/predicates.go
index 4048bd0d607..be868007df0 100644
--- a/resource-manager/machinelearningservices/2022-05-01/batchendpoint/predicates.go
+++ b/resource-manager/machinelearningservices/2022-05-01/batchendpoint/predicates.go
@@ -13,11 +13,11 @@ type BatchEndpointTrackedResourceOperationPredicate struct {
 
 func (p BatchEndpointTrackedResourceOperationPredicate) Matches(input BatchEndpointTrackedResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p BatchEndpointTrackedResourceOperationPredicate) Matches(input BatchEndpo
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-05-01/codecontainer/predicates.go b/resource-manager/machinelearningservices/2022-05-01/codecontainer/predicates.go
index e7a9706d784..1683062d93a 100644
--- a/resource-manager/machinelearningservices/2022-05-01/codecontainer/predicates.go
+++ b/resource-manager/machinelearningservices/2022-05-01/codecontainer/predicates.go
@@ -11,15 +11,15 @@ type CodeContainerResourceOperationPredicate struct {
 
 func (p CodeContainerResourceOperationPredicate) Matches(input CodeContainerResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-05-01/codeversion/predicates.go b/resource-manager/machinelearningservices/2022-05-01/codeversion/predicates.go
index 97cc3bce29e..7cdd3f80215 100644
--- a/resource-manager/machinelearningservices/2022-05-01/codeversion/predicates.go
+++ b/resource-manager/machinelearningservices/2022-05-01/codeversion/predicates.go
@@ -11,15 +11,15 @@ type CodeVersionResourceOperationPredicate struct {
 
 func (p CodeVersionResourceOperationPredicate) Matches(input CodeVersionResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-05-01/componentcontainer/predicates.go b/resource-manager/machinelearningservices/2022-05-01/componentcontainer/predicates.go
index 72a1e0eb811..a7b53e32628 100644
--- a/resource-manager/machinelearningservices/2022-05-01/componentcontainer/predicates.go
+++ b/resource-manager/machinelearningservices/2022-05-01/componentcontainer/predicates.go
@@ -11,15 +11,15 @@ type ComponentContainerResourceOperationPredicate struct {
 
 func (p ComponentContainerResourceOperationPredicate) Matches(input ComponentContainerResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-05-01/componentversion/predicates.go b/resource-manager/machinelearningservices/2022-05-01/componentversion/predicates.go
index 0639dcc9954..a894a1d8ac2 100644
--- a/resource-manager/machinelearningservices/2022-05-01/componentversion/predicates.go
+++ b/resource-manager/machinelearningservices/2022-05-01/componentversion/predicates.go
@@ -11,15 +11,15 @@ type ComponentVersionResourceOperationPredicate struct {
 
 func (p ComponentVersionResourceOperationPredicate) Matches(input ComponentVersionResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-05-01/datacontainer/predicates.go b/resource-manager/machinelearningservices/2022-05-01/datacontainer/predicates.go
index 1347cfc4afb..2c77432ebc2 100644
--- a/resource-manager/machinelearningservices/2022-05-01/datacontainer/predicates.go
+++ b/resource-manager/machinelearningservices/2022-05-01/datacontainer/predicates.go
@@ -11,15 +11,15 @@ type DataContainerResourceOperationPredicate struct {
 
 func (p DataContainerResourceOperationPredicate) Matches(input DataContainerResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-05-01/datastore/predicates.go b/resource-manager/machinelearningservices/2022-05-01/datastore/predicates.go
index 6c3d7469b7c..174b0d437dd 100644
--- a/resource-manager/machinelearningservices/2022-05-01/datastore/predicates.go
+++ b/resource-manager/machinelearningservices/2022-05-01/datastore/predicates.go
@@ -11,15 +11,15 @@ type DatastoreResourceOperationPredicate struct {
 
 func (p DatastoreResourceOperationPredicate) Matches(input DatastoreResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-05-01/dataversion/predicates.go b/resource-manager/machinelearningservices/2022-05-01/dataversion/predicates.go
index 7e995cfc12a..29cdd8a9a0e 100644
--- a/resource-manager/machinelearningservices/2022-05-01/dataversion/predicates.go
+++ b/resource-manager/machinelearningservices/2022-05-01/dataversion/predicates.go
@@ -11,15 +11,15 @@ type DataVersionBaseResourceOperationPredicate struct {
 
 func (p DataVersionBaseResourceOperationPredicate) Matches(input DataVersionBaseResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-05-01/environmentcontainer/predicates.go b/resource-manager/machinelearningservices/2022-05-01/environmentcontainer/predicates.go
index 78d76ad5c7c..1b662862d6e 100644
--- a/resource-manager/machinelearningservices/2022-05-01/environmentcontainer/predicates.go
+++ b/resource-manager/machinelearningservices/2022-05-01/environmentcontainer/predicates.go
@@ -11,15 +11,15 @@ type EnvironmentContainerResourceOperationPredicate struct {
 
 func (p EnvironmentContainerResourceOperationPredicate) Matches(input EnvironmentContainerResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-05-01/environmentversion/predicates.go b/resource-manager/machinelearningservices/2022-05-01/environmentversion/predicates.go
index 31a7cffcafb..88635632632 100644
--- a/resource-manager/machinelearningservices/2022-05-01/environmentversion/predicates.go
+++ b/resource-manager/machinelearningservices/2022-05-01/environmentversion/predicates.go
@@ -11,15 +11,15 @@ type EnvironmentVersionResourceOperationPredicate struct {
 
 func (p EnvironmentVersionResourceOperationPredicate) Matches(input EnvironmentVersionResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-05-01/job/predicates.go b/resource-manager/machinelearningservices/2022-05-01/job/predicates.go
index 2b565cb4e06..aa1d8495bd3 100644
--- a/resource-manager/machinelearningservices/2022-05-01/job/predicates.go
+++ b/resource-manager/machinelearningservices/2022-05-01/job/predicates.go
@@ -11,15 +11,15 @@ type JobBaseResourceOperationPredicate struct {
 
 func (p JobBaseResourceOperationPredicate) Matches(input JobBaseResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-05-01/machinelearningcomputes/predicates.go b/resource-manager/machinelearningservices/2022-05-01/machinelearningcomputes/predicates.go
index 26503bf2031..d6f678c5c4c 100644
--- a/resource-manager/machinelearningservices/2022-05-01/machinelearningcomputes/predicates.go
+++ b/resource-manager/machinelearningservices/2022-05-01/machinelearningcomputes/predicates.go
@@ -9,7 +9,7 @@ type AmlComputeNodesInformationOperationPredicate struct {
 
 func (p AmlComputeNodesInformationOperationPredicate) Matches(input AmlComputeNodesInformation) bool {
 
-	if p.NextLink != nil && (input.NextLink == nil && *p.NextLink != *input.NextLink) {
+	if p.NextLink != nil && (input.NextLink == nil || *p.NextLink != *input.NextLink) {
 		return false
 	}
 
@@ -25,19 +25,19 @@ type ComputeResourceOperationPredicate struct {
 
 func (p ComputeResourceOperationPredicate) Matches(input ComputeResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-05-01/modelcontainer/predicates.go b/resource-manager/machinelearningservices/2022-05-01/modelcontainer/predicates.go
index cfac2b1e4b6..1d70bbda11b 100644
--- a/resource-manager/machinelearningservices/2022-05-01/modelcontainer/predicates.go
+++ b/resource-manager/machinelearningservices/2022-05-01/modelcontainer/predicates.go
@@ -11,15 +11,15 @@ type ModelContainerResourceOperationPredicate struct {
 
 func (p ModelContainerResourceOperationPredicate) Matches(input ModelContainerResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-05-01/modelversion/predicates.go b/resource-manager/machinelearningservices/2022-05-01/modelversion/predicates.go
index 5c140ee8247..5ce605e9db3 100644
--- a/resource-manager/machinelearningservices/2022-05-01/modelversion/predicates.go
+++ b/resource-manager/machinelearningservices/2022-05-01/modelversion/predicates.go
@@ -11,15 +11,15 @@ type ModelVersionResourceOperationPredicate struct {
 
 func (p ModelVersionResourceOperationPredicate) Matches(input ModelVersionResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-05-01/onlinedeployment/predicates.go b/resource-manager/machinelearningservices/2022-05-01/onlinedeployment/predicates.go
index 3d391467c13..980224f2595 100644
--- a/resource-manager/machinelearningservices/2022-05-01/onlinedeployment/predicates.go
+++ b/resource-manager/machinelearningservices/2022-05-01/onlinedeployment/predicates.go
@@ -13,11 +13,11 @@ type OnlineDeploymentTrackedResourceOperationPredicate struct {
 
 func (p OnlineDeploymentTrackedResourceOperationPredicate) Matches(input OnlineDeploymentTrackedResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p OnlineDeploymentTrackedResourceOperationPredicate) Matches(input OnlineD
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -42,7 +42,7 @@ type SkuResourceOperationPredicate struct {
 
 func (p SkuResourceOperationPredicate) Matches(input SkuResource) bool {
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-05-01/onlineendpoint/predicates.go b/resource-manager/machinelearningservices/2022-05-01/onlineendpoint/predicates.go
index fad7a9f3151..bb63f9f9e89 100644
--- a/resource-manager/machinelearningservices/2022-05-01/onlineendpoint/predicates.go
+++ b/resource-manager/machinelearningservices/2022-05-01/onlineendpoint/predicates.go
@@ -13,11 +13,11 @@ type OnlineEndpointTrackedResourceOperationPredicate struct {
 
 func (p OnlineEndpointTrackedResourceOperationPredicate) Matches(input OnlineEndpointTrackedResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p OnlineEndpointTrackedResourceOperationPredicate) Matches(input OnlineEnd
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-05-01/operationalizationclusters/predicates.go b/resource-manager/machinelearningservices/2022-05-01/operationalizationclusters/predicates.go
index 0bc17f87217..cd66eac32cf 100644
--- a/resource-manager/machinelearningservices/2022-05-01/operationalizationclusters/predicates.go
+++ b/resource-manager/machinelearningservices/2022-05-01/operationalizationclusters/predicates.go
@@ -12,19 +12,19 @@ type ComputeResourceOperationPredicate struct {
 
 func (p ComputeResourceOperationPredicate) Matches(input ComputeResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-05-01/quota/predicates.go b/resource-manager/machinelearningservices/2022-05-01/quota/predicates.go
index c2d7498ccc9..958ceee8320 100644
--- a/resource-manager/machinelearningservices/2022-05-01/quota/predicates.go
+++ b/resource-manager/machinelearningservices/2022-05-01/quota/predicates.go
@@ -12,19 +12,19 @@ type ResourceQuotaOperationPredicate struct {
 
 func (p ResourceQuotaOperationPredicate) Matches(input ResourceQuota) bool {
 
-	if p.AmlWorkspaceLocation != nil && (input.AmlWorkspaceLocation == nil && *p.AmlWorkspaceLocation != *input.AmlWorkspaceLocation) {
+	if p.AmlWorkspaceLocation != nil && (input.AmlWorkspaceLocation == nil || *p.AmlWorkspaceLocation != *input.AmlWorkspaceLocation) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-05-01/v2workspaceconnectionresource/predicates.go b/resource-manager/machinelearningservices/2022-05-01/v2workspaceconnectionresource/predicates.go
index 74990cfc821..1fa8bf9ad9f 100644
--- a/resource-manager/machinelearningservices/2022-05-01/v2workspaceconnectionresource/predicates.go
+++ b/resource-manager/machinelearningservices/2022-05-01/v2workspaceconnectionresource/predicates.go
@@ -11,15 +11,15 @@ type WorkspaceConnectionPropertiesV2BasicResourceOperationPredicate struct {
 
 func (p WorkspaceConnectionPropertiesV2BasicResourceOperationPredicate) Matches(input WorkspaceConnectionPropertiesV2BasicResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-05-01/workspaces/predicates.go b/resource-manager/machinelearningservices/2022-05-01/workspaces/predicates.go
index 328e3d8be7f..f6a5840aee9 100644
--- a/resource-manager/machinelearningservices/2022-05-01/workspaces/predicates.go
+++ b/resource-manager/machinelearningservices/2022-05-01/workspaces/predicates.go
@@ -11,15 +11,15 @@ type AmlUserFeatureOperationPredicate struct {
 
 func (p AmlUserFeatureOperationPredicate) Matches(input AmlUserFeature) bool {
 
-	if p.Description != nil && (input.Description == nil && *p.Description != *input.Description) {
+	if p.Description != nil && (input.Description == nil || *p.Description != *input.Description) {
 		return false
 	}
 
-	if p.DisplayName != nil && (input.DisplayName == nil && *p.DisplayName != *input.DisplayName) {
+	if p.DisplayName != nil && (input.DisplayName == nil || *p.DisplayName != *input.DisplayName) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -35,19 +35,19 @@ type WorkspaceOperationPredicate struct {
 
 func (p WorkspaceOperationPredicate) Matches(input Workspace) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-10-01/batchdeployment/predicates.go b/resource-manager/machinelearningservices/2022-10-01/batchdeployment/predicates.go
index 6244ec731cc..2c12ee7610f 100644
--- a/resource-manager/machinelearningservices/2022-10-01/batchdeployment/predicates.go
+++ b/resource-manager/machinelearningservices/2022-10-01/batchdeployment/predicates.go
@@ -13,11 +13,11 @@ type BatchDeploymentTrackedResourceOperationPredicate struct {
 
 func (p BatchDeploymentTrackedResourceOperationPredicate) Matches(input BatchDeploymentTrackedResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p BatchDeploymentTrackedResourceOperationPredicate) Matches(input BatchDep
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-10-01/batchendpoint/predicates.go b/resource-manager/machinelearningservices/2022-10-01/batchendpoint/predicates.go
index 4048bd0d607..be868007df0 100644
--- a/resource-manager/machinelearningservices/2022-10-01/batchendpoint/predicates.go
+++ b/resource-manager/machinelearningservices/2022-10-01/batchendpoint/predicates.go
@@ -13,11 +13,11 @@ type BatchEndpointTrackedResourceOperationPredicate struct {
 
 func (p BatchEndpointTrackedResourceOperationPredicate) Matches(input BatchEndpointTrackedResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p BatchEndpointTrackedResourceOperationPredicate) Matches(input BatchEndpo
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-10-01/codecontainer/predicates.go b/resource-manager/machinelearningservices/2022-10-01/codecontainer/predicates.go
index e7a9706d784..1683062d93a 100644
--- a/resource-manager/machinelearningservices/2022-10-01/codecontainer/predicates.go
+++ b/resource-manager/machinelearningservices/2022-10-01/codecontainer/predicates.go
@@ -11,15 +11,15 @@ type CodeContainerResourceOperationPredicate struct {
 
 func (p CodeContainerResourceOperationPredicate) Matches(input CodeContainerResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-10-01/codeversion/predicates.go b/resource-manager/machinelearningservices/2022-10-01/codeversion/predicates.go
index 97cc3bce29e..7cdd3f80215 100644
--- a/resource-manager/machinelearningservices/2022-10-01/codeversion/predicates.go
+++ b/resource-manager/machinelearningservices/2022-10-01/codeversion/predicates.go
@@ -11,15 +11,15 @@ type CodeVersionResourceOperationPredicate struct {
 
 func (p CodeVersionResourceOperationPredicate) Matches(input CodeVersionResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-10-01/componentcontainer/predicates.go b/resource-manager/machinelearningservices/2022-10-01/componentcontainer/predicates.go
index 72a1e0eb811..a7b53e32628 100644
--- a/resource-manager/machinelearningservices/2022-10-01/componentcontainer/predicates.go
+++ b/resource-manager/machinelearningservices/2022-10-01/componentcontainer/predicates.go
@@ -11,15 +11,15 @@ type ComponentContainerResourceOperationPredicate struct {
 
 func (p ComponentContainerResourceOperationPredicate) Matches(input ComponentContainerResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-10-01/componentversion/predicates.go b/resource-manager/machinelearningservices/2022-10-01/componentversion/predicates.go
index 0639dcc9954..a894a1d8ac2 100644
--- a/resource-manager/machinelearningservices/2022-10-01/componentversion/predicates.go
+++ b/resource-manager/machinelearningservices/2022-10-01/componentversion/predicates.go
@@ -11,15 +11,15 @@ type ComponentVersionResourceOperationPredicate struct {
 
 func (p ComponentVersionResourceOperationPredicate) Matches(input ComponentVersionResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-10-01/datacontainer/predicates.go b/resource-manager/machinelearningservices/2022-10-01/datacontainer/predicates.go
index 1347cfc4afb..2c77432ebc2 100644
--- a/resource-manager/machinelearningservices/2022-10-01/datacontainer/predicates.go
+++ b/resource-manager/machinelearningservices/2022-10-01/datacontainer/predicates.go
@@ -11,15 +11,15 @@ type DataContainerResourceOperationPredicate struct {
 
 func (p DataContainerResourceOperationPredicate) Matches(input DataContainerResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-10-01/datastore/predicates.go b/resource-manager/machinelearningservices/2022-10-01/datastore/predicates.go
index 6c3d7469b7c..174b0d437dd 100644
--- a/resource-manager/machinelearningservices/2022-10-01/datastore/predicates.go
+++ b/resource-manager/machinelearningservices/2022-10-01/datastore/predicates.go
@@ -11,15 +11,15 @@ type DatastoreResourceOperationPredicate struct {
 
 func (p DatastoreResourceOperationPredicate) Matches(input DatastoreResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-10-01/dataversion/predicates.go b/resource-manager/machinelearningservices/2022-10-01/dataversion/predicates.go
index 7e995cfc12a..29cdd8a9a0e 100644
--- a/resource-manager/machinelearningservices/2022-10-01/dataversion/predicates.go
+++ b/resource-manager/machinelearningservices/2022-10-01/dataversion/predicates.go
@@ -11,15 +11,15 @@ type DataVersionBaseResourceOperationPredicate struct {
 
 func (p DataVersionBaseResourceOperationPredicate) Matches(input DataVersionBaseResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-10-01/environmentcontainer/predicates.go b/resource-manager/machinelearningservices/2022-10-01/environmentcontainer/predicates.go
index 78d76ad5c7c..1b662862d6e 100644
--- a/resource-manager/machinelearningservices/2022-10-01/environmentcontainer/predicates.go
+++ b/resource-manager/machinelearningservices/2022-10-01/environmentcontainer/predicates.go
@@ -11,15 +11,15 @@ type EnvironmentContainerResourceOperationPredicate struct {
 
 func (p EnvironmentContainerResourceOperationPredicate) Matches(input EnvironmentContainerResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-10-01/environmentversion/predicates.go b/resource-manager/machinelearningservices/2022-10-01/environmentversion/predicates.go
index 31a7cffcafb..88635632632 100644
--- a/resource-manager/machinelearningservices/2022-10-01/environmentversion/predicates.go
+++ b/resource-manager/machinelearningservices/2022-10-01/environmentversion/predicates.go
@@ -11,15 +11,15 @@ type EnvironmentVersionResourceOperationPredicate struct {
 
 func (p EnvironmentVersionResourceOperationPredicate) Matches(input EnvironmentVersionResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-10-01/job/predicates.go b/resource-manager/machinelearningservices/2022-10-01/job/predicates.go
index 2b565cb4e06..aa1d8495bd3 100644
--- a/resource-manager/machinelearningservices/2022-10-01/job/predicates.go
+++ b/resource-manager/machinelearningservices/2022-10-01/job/predicates.go
@@ -11,15 +11,15 @@ type JobBaseResourceOperationPredicate struct {
 
 func (p JobBaseResourceOperationPredicate) Matches(input JobBaseResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-10-01/machinelearningcomputes/predicates.go b/resource-manager/machinelearningservices/2022-10-01/machinelearningcomputes/predicates.go
index 26503bf2031..d6f678c5c4c 100644
--- a/resource-manager/machinelearningservices/2022-10-01/machinelearningcomputes/predicates.go
+++ b/resource-manager/machinelearningservices/2022-10-01/machinelearningcomputes/predicates.go
@@ -9,7 +9,7 @@ type AmlComputeNodesInformationOperationPredicate struct {
 
 func (p AmlComputeNodesInformationOperationPredicate) Matches(input AmlComputeNodesInformation) bool {
 
-	if p.NextLink != nil && (input.NextLink == nil && *p.NextLink != *input.NextLink) {
+	if p.NextLink != nil && (input.NextLink == nil || *p.NextLink != *input.NextLink) {
 		return false
 	}
 
@@ -25,19 +25,19 @@ type ComputeResourceOperationPredicate struct {
 
 func (p ComputeResourceOperationPredicate) Matches(input ComputeResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-10-01/modelcontainer/predicates.go b/resource-manager/machinelearningservices/2022-10-01/modelcontainer/predicates.go
index cfac2b1e4b6..1d70bbda11b 100644
--- a/resource-manager/machinelearningservices/2022-10-01/modelcontainer/predicates.go
+++ b/resource-manager/machinelearningservices/2022-10-01/modelcontainer/predicates.go
@@ -11,15 +11,15 @@ type ModelContainerResourceOperationPredicate struct {
 
 func (p ModelContainerResourceOperationPredicate) Matches(input ModelContainerResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-10-01/modelversion/predicates.go b/resource-manager/machinelearningservices/2022-10-01/modelversion/predicates.go
index 5c140ee8247..5ce605e9db3 100644
--- a/resource-manager/machinelearningservices/2022-10-01/modelversion/predicates.go
+++ b/resource-manager/machinelearningservices/2022-10-01/modelversion/predicates.go
@@ -11,15 +11,15 @@ type ModelVersionResourceOperationPredicate struct {
 
 func (p ModelVersionResourceOperationPredicate) Matches(input ModelVersionResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-10-01/onlinedeployment/predicates.go b/resource-manager/machinelearningservices/2022-10-01/onlinedeployment/predicates.go
index 3d391467c13..980224f2595 100644
--- a/resource-manager/machinelearningservices/2022-10-01/onlinedeployment/predicates.go
+++ b/resource-manager/machinelearningservices/2022-10-01/onlinedeployment/predicates.go
@@ -13,11 +13,11 @@ type OnlineDeploymentTrackedResourceOperationPredicate struct {
 
 func (p OnlineDeploymentTrackedResourceOperationPredicate) Matches(input OnlineDeploymentTrackedResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p OnlineDeploymentTrackedResourceOperationPredicate) Matches(input OnlineD
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -42,7 +42,7 @@ type SkuResourceOperationPredicate struct {
 
 func (p SkuResourceOperationPredicate) Matches(input SkuResource) bool {
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-10-01/onlineendpoint/predicates.go b/resource-manager/machinelearningservices/2022-10-01/onlineendpoint/predicates.go
index fad7a9f3151..bb63f9f9e89 100644
--- a/resource-manager/machinelearningservices/2022-10-01/onlineendpoint/predicates.go
+++ b/resource-manager/machinelearningservices/2022-10-01/onlineendpoint/predicates.go
@@ -13,11 +13,11 @@ type OnlineEndpointTrackedResourceOperationPredicate struct {
 
 func (p OnlineEndpointTrackedResourceOperationPredicate) Matches(input OnlineEndpointTrackedResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p OnlineEndpointTrackedResourceOperationPredicate) Matches(input OnlineEnd
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-10-01/operationalizationclusters/predicates.go b/resource-manager/machinelearningservices/2022-10-01/operationalizationclusters/predicates.go
index 0bc17f87217..cd66eac32cf 100644
--- a/resource-manager/machinelearningservices/2022-10-01/operationalizationclusters/predicates.go
+++ b/resource-manager/machinelearningservices/2022-10-01/operationalizationclusters/predicates.go
@@ -12,19 +12,19 @@ type ComputeResourceOperationPredicate struct {
 
 func (p ComputeResourceOperationPredicate) Matches(input ComputeResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-10-01/quota/predicates.go b/resource-manager/machinelearningservices/2022-10-01/quota/predicates.go
index c2d7498ccc9..958ceee8320 100644
--- a/resource-manager/machinelearningservices/2022-10-01/quota/predicates.go
+++ b/resource-manager/machinelearningservices/2022-10-01/quota/predicates.go
@@ -12,19 +12,19 @@ type ResourceQuotaOperationPredicate struct {
 
 func (p ResourceQuotaOperationPredicate) Matches(input ResourceQuota) bool {
 
-	if p.AmlWorkspaceLocation != nil && (input.AmlWorkspaceLocation == nil && *p.AmlWorkspaceLocation != *input.AmlWorkspaceLocation) {
+	if p.AmlWorkspaceLocation != nil && (input.AmlWorkspaceLocation == nil || *p.AmlWorkspaceLocation != *input.AmlWorkspaceLocation) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-10-01/schedule/predicates.go b/resource-manager/machinelearningservices/2022-10-01/schedule/predicates.go
index de19d516bfa..25e4b3c469f 100644
--- a/resource-manager/machinelearningservices/2022-10-01/schedule/predicates.go
+++ b/resource-manager/machinelearningservices/2022-10-01/schedule/predicates.go
@@ -11,15 +11,15 @@ type ScheduleResourceOperationPredicate struct {
 
 func (p ScheduleResourceOperationPredicate) Matches(input ScheduleResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-10-01/v2workspaceconnectionresource/predicates.go b/resource-manager/machinelearningservices/2022-10-01/v2workspaceconnectionresource/predicates.go
index 74990cfc821..1fa8bf9ad9f 100644
--- a/resource-manager/machinelearningservices/2022-10-01/v2workspaceconnectionresource/predicates.go
+++ b/resource-manager/machinelearningservices/2022-10-01/v2workspaceconnectionresource/predicates.go
@@ -11,15 +11,15 @@ type WorkspaceConnectionPropertiesV2BasicResourceOperationPredicate struct {
 
 func (p WorkspaceConnectionPropertiesV2BasicResourceOperationPredicate) Matches(input WorkspaceConnectionPropertiesV2BasicResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2022-10-01/workspaces/predicates.go b/resource-manager/machinelearningservices/2022-10-01/workspaces/predicates.go
index 328e3d8be7f..f6a5840aee9 100644
--- a/resource-manager/machinelearningservices/2022-10-01/workspaces/predicates.go
+++ b/resource-manager/machinelearningservices/2022-10-01/workspaces/predicates.go
@@ -11,15 +11,15 @@ type AmlUserFeatureOperationPredicate struct {
 
 func (p AmlUserFeatureOperationPredicate) Matches(input AmlUserFeature) bool {
 
-	if p.Description != nil && (input.Description == nil && *p.Description != *input.Description) {
+	if p.Description != nil && (input.Description == nil || *p.Description != *input.Description) {
 		return false
 	}
 
-	if p.DisplayName != nil && (input.DisplayName == nil && *p.DisplayName != *input.DisplayName) {
+	if p.DisplayName != nil && (input.DisplayName == nil || *p.DisplayName != *input.DisplayName) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -35,19 +35,19 @@ type WorkspaceOperationPredicate struct {
 
 func (p WorkspaceOperationPredicate) Matches(input Workspace) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/batchdeployment/predicates.go b/resource-manager/machinelearningservices/2023-04-01/batchdeployment/predicates.go
index 6244ec731cc..2c12ee7610f 100644
--- a/resource-manager/machinelearningservices/2023-04-01/batchdeployment/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/batchdeployment/predicates.go
@@ -13,11 +13,11 @@ type BatchDeploymentTrackedResourceOperationPredicate struct {
 
 func (p BatchDeploymentTrackedResourceOperationPredicate) Matches(input BatchDeploymentTrackedResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p BatchDeploymentTrackedResourceOperationPredicate) Matches(input BatchDep
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/batchendpoint/predicates.go b/resource-manager/machinelearningservices/2023-04-01/batchendpoint/predicates.go
index 4048bd0d607..be868007df0 100644
--- a/resource-manager/machinelearningservices/2023-04-01/batchendpoint/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/batchendpoint/predicates.go
@@ -13,11 +13,11 @@ type BatchEndpointTrackedResourceOperationPredicate struct {
 
 func (p BatchEndpointTrackedResourceOperationPredicate) Matches(input BatchEndpointTrackedResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p BatchEndpointTrackedResourceOperationPredicate) Matches(input BatchEndpo
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/codecontainer/predicates.go b/resource-manager/machinelearningservices/2023-04-01/codecontainer/predicates.go
index e7a9706d784..1683062d93a 100644
--- a/resource-manager/machinelearningservices/2023-04-01/codecontainer/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/codecontainer/predicates.go
@@ -11,15 +11,15 @@ type CodeContainerResourceOperationPredicate struct {
 
 func (p CodeContainerResourceOperationPredicate) Matches(input CodeContainerResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/codeversion/predicates.go b/resource-manager/machinelearningservices/2023-04-01/codeversion/predicates.go
index 97cc3bce29e..7cdd3f80215 100644
--- a/resource-manager/machinelearningservices/2023-04-01/codeversion/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/codeversion/predicates.go
@@ -11,15 +11,15 @@ type CodeVersionResourceOperationPredicate struct {
 
 func (p CodeVersionResourceOperationPredicate) Matches(input CodeVersionResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/componentcontainer/predicates.go b/resource-manager/machinelearningservices/2023-04-01/componentcontainer/predicates.go
index 72a1e0eb811..a7b53e32628 100644
--- a/resource-manager/machinelearningservices/2023-04-01/componentcontainer/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/componentcontainer/predicates.go
@@ -11,15 +11,15 @@ type ComponentContainerResourceOperationPredicate struct {
 
 func (p ComponentContainerResourceOperationPredicate) Matches(input ComponentContainerResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/componentversion/predicates.go b/resource-manager/machinelearningservices/2023-04-01/componentversion/predicates.go
index 0639dcc9954..a894a1d8ac2 100644
--- a/resource-manager/machinelearningservices/2023-04-01/componentversion/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/componentversion/predicates.go
@@ -11,15 +11,15 @@ type ComponentVersionResourceOperationPredicate struct {
 
 func (p ComponentVersionResourceOperationPredicate) Matches(input ComponentVersionResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/datacontainer/predicates.go b/resource-manager/machinelearningservices/2023-04-01/datacontainer/predicates.go
index 1347cfc4afb..2c77432ebc2 100644
--- a/resource-manager/machinelearningservices/2023-04-01/datacontainer/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/datacontainer/predicates.go
@@ -11,15 +11,15 @@ type DataContainerResourceOperationPredicate struct {
 
 func (p DataContainerResourceOperationPredicate) Matches(input DataContainerResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/datacontainerregistry/predicates.go b/resource-manager/machinelearningservices/2023-04-01/datacontainerregistry/predicates.go
index 9100c495772..c03ad5f907e 100644
--- a/resource-manager/machinelearningservices/2023-04-01/datacontainerregistry/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/datacontainerregistry/predicates.go
@@ -11,15 +11,15 @@ type DataContainerResourceOperationPredicate struct {
 
 func (p DataContainerResourceOperationPredicate) Matches(input DataContainerResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/datastore/predicates.go b/resource-manager/machinelearningservices/2023-04-01/datastore/predicates.go
index 6c3d7469b7c..174b0d437dd 100644
--- a/resource-manager/machinelearningservices/2023-04-01/datastore/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/datastore/predicates.go
@@ -11,15 +11,15 @@ type DatastoreResourceOperationPredicate struct {
 
 func (p DatastoreResourceOperationPredicate) Matches(input DatastoreResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/dataversion/predicates.go b/resource-manager/machinelearningservices/2023-04-01/dataversion/predicates.go
index 7e995cfc12a..29cdd8a9a0e 100644
--- a/resource-manager/machinelearningservices/2023-04-01/dataversion/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/dataversion/predicates.go
@@ -11,15 +11,15 @@ type DataVersionBaseResourceOperationPredicate struct {
 
 func (p DataVersionBaseResourceOperationPredicate) Matches(input DataVersionBaseResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/dataversionregistry/predicates.go b/resource-manager/machinelearningservices/2023-04-01/dataversionregistry/predicates.go
index 41202d6e54f..b3559d5bc54 100644
--- a/resource-manager/machinelearningservices/2023-04-01/dataversionregistry/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/dataversionregistry/predicates.go
@@ -11,15 +11,15 @@ type DataVersionBaseResourceOperationPredicate struct {
 
 func (p DataVersionBaseResourceOperationPredicate) Matches(input DataVersionBaseResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/environmentcontainer/predicates.go b/resource-manager/machinelearningservices/2023-04-01/environmentcontainer/predicates.go
index 78d76ad5c7c..1b662862d6e 100644
--- a/resource-manager/machinelearningservices/2023-04-01/environmentcontainer/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/environmentcontainer/predicates.go
@@ -11,15 +11,15 @@ type EnvironmentContainerResourceOperationPredicate struct {
 
 func (p EnvironmentContainerResourceOperationPredicate) Matches(input EnvironmentContainerResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/environmentversion/predicates.go b/resource-manager/machinelearningservices/2023-04-01/environmentversion/predicates.go
index 31a7cffcafb..88635632632 100644
--- a/resource-manager/machinelearningservices/2023-04-01/environmentversion/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/environmentversion/predicates.go
@@ -11,15 +11,15 @@ type EnvironmentVersionResourceOperationPredicate struct {
 
 func (p EnvironmentVersionResourceOperationPredicate) Matches(input EnvironmentVersionResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/job/predicates.go b/resource-manager/machinelearningservices/2023-04-01/job/predicates.go
index 2b565cb4e06..aa1d8495bd3 100644
--- a/resource-manager/machinelearningservices/2023-04-01/job/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/job/predicates.go
@@ -11,15 +11,15 @@ type JobBaseResourceOperationPredicate struct {
 
 func (p JobBaseResourceOperationPredicate) Matches(input JobBaseResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/machinelearningcomputes/predicates.go b/resource-manager/machinelearningservices/2023-04-01/machinelearningcomputes/predicates.go
index 26503bf2031..d6f678c5c4c 100644
--- a/resource-manager/machinelearningservices/2023-04-01/machinelearningcomputes/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/machinelearningcomputes/predicates.go
@@ -9,7 +9,7 @@ type AmlComputeNodesInformationOperationPredicate struct {
 
 func (p AmlComputeNodesInformationOperationPredicate) Matches(input AmlComputeNodesInformation) bool {
 
-	if p.NextLink != nil && (input.NextLink == nil && *p.NextLink != *input.NextLink) {
+	if p.NextLink != nil && (input.NextLink == nil || *p.NextLink != *input.NextLink) {
 		return false
 	}
 
@@ -25,19 +25,19 @@ type ComputeResourceOperationPredicate struct {
 
 func (p ComputeResourceOperationPredicate) Matches(input ComputeResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/modelcontainer/predicates.go b/resource-manager/machinelearningservices/2023-04-01/modelcontainer/predicates.go
index cfac2b1e4b6..1d70bbda11b 100644
--- a/resource-manager/machinelearningservices/2023-04-01/modelcontainer/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/modelcontainer/predicates.go
@@ -11,15 +11,15 @@ type ModelContainerResourceOperationPredicate struct {
 
 func (p ModelContainerResourceOperationPredicate) Matches(input ModelContainerResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/modelversion/predicates.go b/resource-manager/machinelearningservices/2023-04-01/modelversion/predicates.go
index 5c140ee8247..5ce605e9db3 100644
--- a/resource-manager/machinelearningservices/2023-04-01/modelversion/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/modelversion/predicates.go
@@ -11,15 +11,15 @@ type ModelVersionResourceOperationPredicate struct {
 
 func (p ModelVersionResourceOperationPredicate) Matches(input ModelVersionResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/onlinedeployment/predicates.go b/resource-manager/machinelearningservices/2023-04-01/onlinedeployment/predicates.go
index 3d391467c13..980224f2595 100644
--- a/resource-manager/machinelearningservices/2023-04-01/onlinedeployment/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/onlinedeployment/predicates.go
@@ -13,11 +13,11 @@ type OnlineDeploymentTrackedResourceOperationPredicate struct {
 
 func (p OnlineDeploymentTrackedResourceOperationPredicate) Matches(input OnlineDeploymentTrackedResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p OnlineDeploymentTrackedResourceOperationPredicate) Matches(input OnlineD
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -42,7 +42,7 @@ type SkuResourceOperationPredicate struct {
 
 func (p SkuResourceOperationPredicate) Matches(input SkuResource) bool {
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/onlineendpoint/predicates.go b/resource-manager/machinelearningservices/2023-04-01/onlineendpoint/predicates.go
index fad7a9f3151..bb63f9f9e89 100644
--- a/resource-manager/machinelearningservices/2023-04-01/onlineendpoint/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/onlineendpoint/predicates.go
@@ -13,11 +13,11 @@ type OnlineEndpointTrackedResourceOperationPredicate struct {
 
 func (p OnlineEndpointTrackedResourceOperationPredicate) Matches(input OnlineEndpointTrackedResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p OnlineEndpointTrackedResourceOperationPredicate) Matches(input OnlineEnd
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/operationalizationclusters/predicates.go b/resource-manager/machinelearningservices/2023-04-01/operationalizationclusters/predicates.go
index 0bc17f87217..cd66eac32cf 100644
--- a/resource-manager/machinelearningservices/2023-04-01/operationalizationclusters/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/operationalizationclusters/predicates.go
@@ -12,19 +12,19 @@ type ComputeResourceOperationPredicate struct {
 
 func (p ComputeResourceOperationPredicate) Matches(input ComputeResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/quota/predicates.go b/resource-manager/machinelearningservices/2023-04-01/quota/predicates.go
index c2d7498ccc9..958ceee8320 100644
--- a/resource-manager/machinelearningservices/2023-04-01/quota/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/quota/predicates.go
@@ -12,19 +12,19 @@ type ResourceQuotaOperationPredicate struct {
 
 func (p ResourceQuotaOperationPredicate) Matches(input ResourceQuota) bool {
 
-	if p.AmlWorkspaceLocation != nil && (input.AmlWorkspaceLocation == nil && *p.AmlWorkspaceLocation != *input.AmlWorkspaceLocation) {
+	if p.AmlWorkspaceLocation != nil && (input.AmlWorkspaceLocation == nil || *p.AmlWorkspaceLocation != *input.AmlWorkspaceLocation) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/registrymanagement/predicates.go b/resource-manager/machinelearningservices/2023-04-01/registrymanagement/predicates.go
index e05499d85cf..4f190d2b8d3 100644
--- a/resource-manager/machinelearningservices/2023-04-01/registrymanagement/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/registrymanagement/predicates.go
@@ -13,11 +13,11 @@ type RegistryTrackedResourceOperationPredicate struct {
 
 func (p RegistryTrackedResourceOperationPredicate) Matches(input RegistryTrackedResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p RegistryTrackedResourceOperationPredicate) Matches(input RegistryTracked
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/schedule/predicates.go b/resource-manager/machinelearningservices/2023-04-01/schedule/predicates.go
index de19d516bfa..25e4b3c469f 100644
--- a/resource-manager/machinelearningservices/2023-04-01/schedule/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/schedule/predicates.go
@@ -11,15 +11,15 @@ type ScheduleResourceOperationPredicate struct {
 
 func (p ScheduleResourceOperationPredicate) Matches(input ScheduleResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/v2workspaceconnectionresource/predicates.go b/resource-manager/machinelearningservices/2023-04-01/v2workspaceconnectionresource/predicates.go
index 74990cfc821..1fa8bf9ad9f 100644
--- a/resource-manager/machinelearningservices/2023-04-01/v2workspaceconnectionresource/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/v2workspaceconnectionresource/predicates.go
@@ -11,15 +11,15 @@ type WorkspaceConnectionPropertiesV2BasicResourceOperationPredicate struct {
 
 func (p WorkspaceConnectionPropertiesV2BasicResourceOperationPredicate) Matches(input WorkspaceConnectionPropertiesV2BasicResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/machinelearningservices/2023-04-01/workspaces/predicates.go b/resource-manager/machinelearningservices/2023-04-01/workspaces/predicates.go
index 328e3d8be7f..f6a5840aee9 100644
--- a/resource-manager/machinelearningservices/2023-04-01/workspaces/predicates.go
+++ b/resource-manager/machinelearningservices/2023-04-01/workspaces/predicates.go
@@ -11,15 +11,15 @@ type AmlUserFeatureOperationPredicate struct {
 
 func (p AmlUserFeatureOperationPredicate) Matches(input AmlUserFeature) bool {
 
-	if p.Description != nil && (input.Description == nil && *p.Description != *input.Description) {
+	if p.Description != nil && (input.Description == nil || *p.Description != *input.Description) {
 		return false
 	}
 
-	if p.DisplayName != nil && (input.DisplayName == nil && *p.DisplayName != *input.DisplayName) {
+	if p.DisplayName != nil && (input.DisplayName == nil || *p.DisplayName != *input.DisplayName) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -35,19 +35,19 @@ type WorkspaceOperationPredicate struct {
 
 func (p WorkspaceOperationPredicate) Matches(input Workspace) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/managedapplications/2019-07-01/applicationdefinitions/predicates.go b/resource-manager/managedapplications/2019-07-01/applicationdefinitions/predicates.go
index 3e73ec2907f..5ff1550948b 100644
--- a/resource-manager/managedapplications/2019-07-01/applicationdefinitions/predicates.go
+++ b/resource-manager/managedapplications/2019-07-01/applicationdefinitions/predicates.go
@@ -13,23 +13,23 @@ type ApplicationDefinitionOperationPredicate struct {
 
 func (p ApplicationDefinitionOperationPredicate) Matches(input ApplicationDefinition) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/managedapplications/2019-07-01/applications/predicates.go b/resource-manager/managedapplications/2019-07-01/applications/predicates.go
index ce73dd93181..e60f126a7c2 100644
--- a/resource-manager/managedapplications/2019-07-01/applications/predicates.go
+++ b/resource-manager/managedapplications/2019-07-01/applications/predicates.go
@@ -14,7 +14,7 @@ type ApplicationOperationPredicate struct {
 
 func (p ApplicationOperationPredicate) Matches(input Application) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -22,19 +22,19 @@ func (p ApplicationOperationPredicate) Matches(input Application) bool {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/managedapplications/2021-07-01/applicationdefinitions/predicates.go b/resource-manager/managedapplications/2021-07-01/applicationdefinitions/predicates.go
index 3e73ec2907f..5ff1550948b 100644
--- a/resource-manager/managedapplications/2021-07-01/applicationdefinitions/predicates.go
+++ b/resource-manager/managedapplications/2021-07-01/applicationdefinitions/predicates.go
@@ -13,23 +13,23 @@ type ApplicationDefinitionOperationPredicate struct {
 
 func (p ApplicationDefinitionOperationPredicate) Matches(input ApplicationDefinition) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/managedapplications/2021-07-01/applications/predicates.go b/resource-manager/managedapplications/2021-07-01/applications/predicates.go
index ce73dd93181..e60f126a7c2 100644
--- a/resource-manager/managedapplications/2021-07-01/applications/predicates.go
+++ b/resource-manager/managedapplications/2021-07-01/applications/predicates.go
@@ -14,7 +14,7 @@ type ApplicationOperationPredicate struct {
 
 func (p ApplicationOperationPredicate) Matches(input Application) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -22,19 +22,19 @@ func (p ApplicationOperationPredicate) Matches(input Application) bool {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/managedidentity/2023-01-31/managedidentities/predicates.go b/resource-manager/managedidentity/2023-01-31/managedidentities/predicates.go
index 93de3ef53e4..d881e5b06f3 100644
--- a/resource-manager/managedidentity/2023-01-31/managedidentities/predicates.go
+++ b/resource-manager/managedidentity/2023-01-31/managedidentities/predicates.go
@@ -11,15 +11,15 @@ type FederatedIdentityCredentialOperationPredicate struct {
 
 func (p FederatedIdentityCredentialOperationPredicate) Matches(input FederatedIdentityCredential) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -35,7 +35,7 @@ type IdentityOperationPredicate struct {
 
 func (p IdentityOperationPredicate) Matches(input Identity) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -43,11 +43,11 @@ func (p IdentityOperationPredicate) Matches(input Identity) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/managedservices/2019-06-01/registrationassignments/predicates.go b/resource-manager/managedservices/2019-06-01/registrationassignments/predicates.go
index 62b6c1afa55..c73401b099f 100644
--- a/resource-manager/managedservices/2019-06-01/registrationassignments/predicates.go
+++ b/resource-manager/managedservices/2019-06-01/registrationassignments/predicates.go
@@ -11,15 +11,15 @@ type RegistrationAssignmentOperationPredicate struct {
 
 func (p RegistrationAssignmentOperationPredicate) Matches(input RegistrationAssignment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/managedservices/2019-06-01/registrationdefinitions/predicates.go b/resource-manager/managedservices/2019-06-01/registrationdefinitions/predicates.go
index 410ab430269..7caff6316ea 100644
--- a/resource-manager/managedservices/2019-06-01/registrationdefinitions/predicates.go
+++ b/resource-manager/managedservices/2019-06-01/registrationdefinitions/predicates.go
@@ -11,15 +11,15 @@ type RegistrationDefinitionOperationPredicate struct {
 
 func (p RegistrationDefinitionOperationPredicate) Matches(input RegistrationDefinition) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/managedservices/2022-10-01/marketplaceregistrationdefinitions/predicates.go b/resource-manager/managedservices/2022-10-01/marketplaceregistrationdefinitions/predicates.go
index 17e5ded33df..b3a241a1cc8 100644
--- a/resource-manager/managedservices/2022-10-01/marketplaceregistrationdefinitions/predicates.go
+++ b/resource-manager/managedservices/2022-10-01/marketplaceregistrationdefinitions/predicates.go
@@ -11,15 +11,15 @@ type MarketplaceRegistrationDefinitionOperationPredicate struct {
 
 func (p MarketplaceRegistrationDefinitionOperationPredicate) Matches(input MarketplaceRegistrationDefinition) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/managedservices/2022-10-01/registrationassignments/predicates.go b/resource-manager/managedservices/2022-10-01/registrationassignments/predicates.go
index 62b6c1afa55..c73401b099f 100644
--- a/resource-manager/managedservices/2022-10-01/registrationassignments/predicates.go
+++ b/resource-manager/managedservices/2022-10-01/registrationassignments/predicates.go
@@ -11,15 +11,15 @@ type RegistrationAssignmentOperationPredicate struct {
 
 func (p RegistrationAssignmentOperationPredicate) Matches(input RegistrationAssignment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/managedservices/2022-10-01/registrationdefinitions/predicates.go b/resource-manager/managedservices/2022-10-01/registrationdefinitions/predicates.go
index 410ab430269..7caff6316ea 100644
--- a/resource-manager/managedservices/2022-10-01/registrationdefinitions/predicates.go
+++ b/resource-manager/managedservices/2022-10-01/registrationdefinitions/predicates.go
@@ -11,15 +11,15 @@ type RegistrationDefinitionOperationPredicate struct {
 
 func (p RegistrationDefinitionOperationPredicate) Matches(input RegistrationDefinition) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/managementgroups/2020-05-01/entities/predicates.go b/resource-manager/managementgroups/2020-05-01/entities/predicates.go
index 515f70d3d4d..65e94badaf5 100644
--- a/resource-manager/managementgroups/2020-05-01/entities/predicates.go
+++ b/resource-manager/managementgroups/2020-05-01/entities/predicates.go
@@ -11,15 +11,15 @@ type EntityInfoOperationPredicate struct {
 
 func (p EntityInfoOperationPredicate) Matches(input EntityInfo) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/managementgroups/2020-05-01/managementgroups/predicates.go b/resource-manager/managementgroups/2020-05-01/managementgroups/predicates.go
index fc878cdafc0..0ae74d4138b 100644
--- a/resource-manager/managementgroups/2020-05-01/managementgroups/predicates.go
+++ b/resource-manager/managementgroups/2020-05-01/managementgroups/predicates.go
@@ -11,15 +11,15 @@ type DescendantInfoOperationPredicate struct {
 
 func (p DescendantInfoOperationPredicate) Matches(input DescendantInfo) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type ManagementGroupInfoOperationPredicate struct {
 
 func (p ManagementGroupInfoOperationPredicate) Matches(input ManagementGroupInfo) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -57,15 +57,15 @@ type SubscriptionUnderManagementGroupOperationPredicate struct {
 
 func (p SubscriptionUnderManagementGroupOperationPredicate) Matches(input SubscriptionUnderManagementGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/managementgroups/2021-04-01/entities/predicates.go b/resource-manager/managementgroups/2021-04-01/entities/predicates.go
index 515f70d3d4d..65e94badaf5 100644
--- a/resource-manager/managementgroups/2021-04-01/entities/predicates.go
+++ b/resource-manager/managementgroups/2021-04-01/entities/predicates.go
@@ -11,15 +11,15 @@ type EntityInfoOperationPredicate struct {
 
 func (p EntityInfoOperationPredicate) Matches(input EntityInfo) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/managementgroups/2021-04-01/managementgroups/predicates.go b/resource-manager/managementgroups/2021-04-01/managementgroups/predicates.go
index fc878cdafc0..0ae74d4138b 100644
--- a/resource-manager/managementgroups/2021-04-01/managementgroups/predicates.go
+++ b/resource-manager/managementgroups/2021-04-01/managementgroups/predicates.go
@@ -11,15 +11,15 @@ type DescendantInfoOperationPredicate struct {
 
 func (p DescendantInfoOperationPredicate) Matches(input DescendantInfo) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type ManagementGroupInfoOperationPredicate struct {
 
 func (p ManagementGroupInfoOperationPredicate) Matches(input ManagementGroupInfo) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -57,15 +57,15 @@ type SubscriptionUnderManagementGroupOperationPredicate struct {
 
 func (p SubscriptionUnderManagementGroupOperationPredicate) Matches(input SubscriptionUnderManagementGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/maps/2021-02-01/accounts/predicates.go b/resource-manager/maps/2021-02-01/accounts/predicates.go
index 095a4f59f60..96ca0ddebe6 100644
--- a/resource-manager/maps/2021-02-01/accounts/predicates.go
+++ b/resource-manager/maps/2021-02-01/accounts/predicates.go
@@ -12,7 +12,7 @@ type MapsAccountOperationPredicate struct {
 
 func (p MapsAccountOperationPredicate) Matches(input MapsAccount) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p MapsAccountOperationPredicate) Matches(input MapsAccount) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/maps/2021-02-01/creators/predicates.go b/resource-manager/maps/2021-02-01/creators/predicates.go
index 1daa81ebdcd..1309d724393 100644
--- a/resource-manager/maps/2021-02-01/creators/predicates.go
+++ b/resource-manager/maps/2021-02-01/creators/predicates.go
@@ -12,7 +12,7 @@ type CreatorOperationPredicate struct {
 
 func (p CreatorOperationPredicate) Matches(input Creator) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p CreatorOperationPredicate) Matches(input Creator) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/maps/2021-02-01/operations/predicates.go b/resource-manager/maps/2021-02-01/operations/predicates.go
index 7f6abc5f9a3..58ea9002be1 100644
--- a/resource-manager/maps/2021-02-01/operations/predicates.go
+++ b/resource-manager/maps/2021-02-01/operations/predicates.go
@@ -11,15 +11,15 @@ type OperationDetailOperationPredicate struct {
 
 func (p OperationDetailOperationPredicate) Matches(input OperationDetail) bool {
 
-	if p.IsDataAction != nil && (input.IsDataAction == nil && *p.IsDataAction != *input.IsDataAction) {
+	if p.IsDataAction != nil && (input.IsDataAction == nil || *p.IsDataAction != *input.IsDataAction) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Origin != nil && (input.Origin == nil && *p.Origin != *input.Origin) {
+	if p.Origin != nil && (input.Origin == nil || *p.Origin != *input.Origin) {
 		return false
 	}
 
diff --git a/resource-manager/mariadb/2018-06-01-preview/serversecurityalertpolicies/predicates.go b/resource-manager/mariadb/2018-06-01-preview/serversecurityalertpolicies/predicates.go
index ac6768d8eb2..ff213a5f292 100644
--- a/resource-manager/mariadb/2018-06-01-preview/serversecurityalertpolicies/predicates.go
+++ b/resource-manager/mariadb/2018-06-01-preview/serversecurityalertpolicies/predicates.go
@@ -11,15 +11,15 @@ type ServerSecurityAlertPolicyOperationPredicate struct {
 
 func (p ServerSecurityAlertPolicyOperationPredicate) Matches(input ServerSecurityAlertPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mariadb/2018-06-01-preview/virtualnetworkrules/predicates.go b/resource-manager/mariadb/2018-06-01-preview/virtualnetworkrules/predicates.go
index 3050c3d8f64..9170201b8d5 100644
--- a/resource-manager/mariadb/2018-06-01-preview/virtualnetworkrules/predicates.go
+++ b/resource-manager/mariadb/2018-06-01-preview/virtualnetworkrules/predicates.go
@@ -11,15 +11,15 @@ type VirtualNetworkRuleOperationPredicate struct {
 
 func (p VirtualNetworkRuleOperationPredicate) Matches(input VirtualNetworkRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mariadb/2018-06-01/advisors/predicates.go b/resource-manager/mariadb/2018-06-01/advisors/predicates.go
index 2ae3a8b9d7e..81f564400a6 100644
--- a/resource-manager/mariadb/2018-06-01/advisors/predicates.go
+++ b/resource-manager/mariadb/2018-06-01/advisors/predicates.go
@@ -12,19 +12,19 @@ type AdvisorOperationPredicate struct {
 
 func (p AdvisorOperationPredicate) Matches(input Advisor) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Properties != nil && (input.Properties == nil && *p.Properties != *input.Properties) {
+	if p.Properties != nil && (input.Properties == nil || *p.Properties != *input.Properties) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mariadb/2018-06-01/locationbasedrecommendedactionsessionsresult/predicates.go b/resource-manager/mariadb/2018-06-01/locationbasedrecommendedactionsessionsresult/predicates.go
index 77d8b8b914b..8d0b9f4c5a1 100644
--- a/resource-manager/mariadb/2018-06-01/locationbasedrecommendedactionsessionsresult/predicates.go
+++ b/resource-manager/mariadb/2018-06-01/locationbasedrecommendedactionsessionsresult/predicates.go
@@ -11,15 +11,15 @@ type RecommendationActionOperationPredicate struct {
 
 func (p RecommendationActionOperationPredicate) Matches(input RecommendationAction) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mariadb/2018-06-01/privateendpointconnections/predicates.go b/resource-manager/mariadb/2018-06-01/privateendpointconnections/predicates.go
index bea3f66b397..4a03a91ce52 100644
--- a/resource-manager/mariadb/2018-06-01/privateendpointconnections/predicates.go
+++ b/resource-manager/mariadb/2018-06-01/privateendpointconnections/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mariadb/2018-06-01/privatelinkresources/predicates.go b/resource-manager/mariadb/2018-06-01/privatelinkresources/predicates.go
index 29d787f073a..19b771c3994 100644
--- a/resource-manager/mariadb/2018-06-01/privatelinkresources/predicates.go
+++ b/resource-manager/mariadb/2018-06-01/privatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mariadb/2018-06-01/querytexts/predicates.go b/resource-manager/mariadb/2018-06-01/querytexts/predicates.go
index 18c87efd56c..8469f83ed41 100644
--- a/resource-manager/mariadb/2018-06-01/querytexts/predicates.go
+++ b/resource-manager/mariadb/2018-06-01/querytexts/predicates.go
@@ -11,15 +11,15 @@ type QueryTextOperationPredicate struct {
 
 func (p QueryTextOperationPredicate) Matches(input QueryText) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mariadb/2018-06-01/recommendedactions/predicates.go b/resource-manager/mariadb/2018-06-01/recommendedactions/predicates.go
index 6b473c28dea..8e28466d19b 100644
--- a/resource-manager/mariadb/2018-06-01/recommendedactions/predicates.go
+++ b/resource-manager/mariadb/2018-06-01/recommendedactions/predicates.go
@@ -11,15 +11,15 @@ type RecommendationActionOperationPredicate struct {
 
 func (p RecommendationActionOperationPredicate) Matches(input RecommendationAction) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mariadb/2018-06-01/serversecurityalertpolicies/predicates.go b/resource-manager/mariadb/2018-06-01/serversecurityalertpolicies/predicates.go
index ac6768d8eb2..ff213a5f292 100644
--- a/resource-manager/mariadb/2018-06-01/serversecurityalertpolicies/predicates.go
+++ b/resource-manager/mariadb/2018-06-01/serversecurityalertpolicies/predicates.go
@@ -11,15 +11,15 @@ type ServerSecurityAlertPolicyOperationPredicate struct {
 
 func (p ServerSecurityAlertPolicyOperationPredicate) Matches(input ServerSecurityAlertPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mariadb/2018-06-01/topquerystatistics/predicates.go b/resource-manager/mariadb/2018-06-01/topquerystatistics/predicates.go
index 2048510f797..c853f547691 100644
--- a/resource-manager/mariadb/2018-06-01/topquerystatistics/predicates.go
+++ b/resource-manager/mariadb/2018-06-01/topquerystatistics/predicates.go
@@ -11,15 +11,15 @@ type QueryStatisticOperationPredicate struct {
 
 func (p QueryStatisticOperationPredicate) Matches(input QueryStatistic) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mariadb/2018-06-01/virtualnetworkrules/predicates.go b/resource-manager/mariadb/2018-06-01/virtualnetworkrules/predicates.go
index 3050c3d8f64..9170201b8d5 100644
--- a/resource-manager/mariadb/2018-06-01/virtualnetworkrules/predicates.go
+++ b/resource-manager/mariadb/2018-06-01/virtualnetworkrules/predicates.go
@@ -11,15 +11,15 @@ type VirtualNetworkRuleOperationPredicate struct {
 
 func (p VirtualNetworkRuleOperationPredicate) Matches(input VirtualNetworkRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mariadb/2018-06-01/waitstatistics/predicates.go b/resource-manager/mariadb/2018-06-01/waitstatistics/predicates.go
index 6c6cc2d05b9..9fe1b39cb11 100644
--- a/resource-manager/mariadb/2018-06-01/waitstatistics/predicates.go
+++ b/resource-manager/mariadb/2018-06-01/waitstatistics/predicates.go
@@ -11,15 +11,15 @@ type WaitStatisticOperationPredicate struct {
 
 func (p WaitStatisticOperationPredicate) Matches(input WaitStatistic) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/media/2021-11-01/accountfilters/predicates.go b/resource-manager/media/2021-11-01/accountfilters/predicates.go
index 942b5cd5798..0d50e33a6f3 100644
--- a/resource-manager/media/2021-11-01/accountfilters/predicates.go
+++ b/resource-manager/media/2021-11-01/accountfilters/predicates.go
@@ -11,15 +11,15 @@ type AccountFilterOperationPredicate struct {
 
 func (p AccountFilterOperationPredicate) Matches(input AccountFilter) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/media/2021-11-01/accounts/predicates.go b/resource-manager/media/2021-11-01/accounts/predicates.go
index efbf2040f0f..009ed7a3027 100644
--- a/resource-manager/media/2021-11-01/accounts/predicates.go
+++ b/resource-manager/media/2021-11-01/accounts/predicates.go
@@ -12,7 +12,7 @@ type MediaServiceOperationPredicate struct {
 
 func (p MediaServiceOperationPredicate) Matches(input MediaService) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p MediaServiceOperationPredicate) Matches(input MediaService) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/media/2021-11-01/assetsandassetfilters/predicates.go b/resource-manager/media/2021-11-01/assetsandassetfilters/predicates.go
index 221548acada..edfee529cb2 100644
--- a/resource-manager/media/2021-11-01/assetsandassetfilters/predicates.go
+++ b/resource-manager/media/2021-11-01/assetsandassetfilters/predicates.go
@@ -11,15 +11,15 @@ type AssetOperationPredicate struct {
 
 func (p AssetOperationPredicate) Matches(input Asset) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type AssetFilterOperationPredicate struct {
 
 func (p AssetFilterOperationPredicate) Matches(input AssetFilter) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/media/2021-11-01/contentkeypolicies/predicates.go b/resource-manager/media/2021-11-01/contentkeypolicies/predicates.go
index 11a5beb8aa3..4c2e5b15246 100644
--- a/resource-manager/media/2021-11-01/contentkeypolicies/predicates.go
+++ b/resource-manager/media/2021-11-01/contentkeypolicies/predicates.go
@@ -11,15 +11,15 @@ type ContentKeyPolicyOperationPredicate struct {
 
 func (p ContentKeyPolicyOperationPredicate) Matches(input ContentKeyPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/media/2021-11-01/encodings/predicates.go b/resource-manager/media/2021-11-01/encodings/predicates.go
index ac8accb332f..7c97ff6b811 100644
--- a/resource-manager/media/2021-11-01/encodings/predicates.go
+++ b/resource-manager/media/2021-11-01/encodings/predicates.go
@@ -11,15 +11,15 @@ type JobOperationPredicate struct {
 
 func (p JobOperationPredicate) Matches(input Job) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type TransformOperationPredicate struct {
 
 func (p TransformOperationPredicate) Matches(input Transform) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/media/2021-11-01/liveevents/predicates.go b/resource-manager/media/2021-11-01/liveevents/predicates.go
index f75518bdb51..6b80594f77e 100644
--- a/resource-manager/media/2021-11-01/liveevents/predicates.go
+++ b/resource-manager/media/2021-11-01/liveevents/predicates.go
@@ -12,7 +12,7 @@ type LiveEventOperationPredicate struct {
 
 func (p LiveEventOperationPredicate) Matches(input LiveEvent) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p LiveEventOperationPredicate) Matches(input LiveEvent) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/media/2021-11-01/liveoutputs/predicates.go b/resource-manager/media/2021-11-01/liveoutputs/predicates.go
index e5f0d7c56e9..1d83a4de688 100644
--- a/resource-manager/media/2021-11-01/liveoutputs/predicates.go
+++ b/resource-manager/media/2021-11-01/liveoutputs/predicates.go
@@ -11,15 +11,15 @@ type LiveOutputOperationPredicate struct {
 
 func (p LiveOutputOperationPredicate) Matches(input LiveOutput) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/media/2021-11-01/streamingendpoints/predicates.go b/resource-manager/media/2021-11-01/streamingendpoints/predicates.go
index 132ecf41e26..9f21dc14d92 100644
--- a/resource-manager/media/2021-11-01/streamingendpoints/predicates.go
+++ b/resource-manager/media/2021-11-01/streamingendpoints/predicates.go
@@ -12,7 +12,7 @@ type StreamingEndpointOperationPredicate struct {
 
 func (p StreamingEndpointOperationPredicate) Matches(input StreamingEndpoint) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p StreamingEndpointOperationPredicate) Matches(input StreamingEndpoint) bo
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/media/2021-11-01/streamingpoliciesandstreaminglocators/predicates.go b/resource-manager/media/2021-11-01/streamingpoliciesandstreaminglocators/predicates.go
index 35871c99210..f5a87258ff4 100644
--- a/resource-manager/media/2021-11-01/streamingpoliciesandstreaminglocators/predicates.go
+++ b/resource-manager/media/2021-11-01/streamingpoliciesandstreaminglocators/predicates.go
@@ -11,15 +11,15 @@ type StreamingLocatorOperationPredicate struct {
 
 func (p StreamingLocatorOperationPredicate) Matches(input StreamingLocator) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type StreamingPolicyOperationPredicate struct {
 
 func (p StreamingPolicyOperationPredicate) Matches(input StreamingPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/media/2022-07-01/encodings/predicates.go b/resource-manager/media/2022-07-01/encodings/predicates.go
index ac8accb332f..7c97ff6b811 100644
--- a/resource-manager/media/2022-07-01/encodings/predicates.go
+++ b/resource-manager/media/2022-07-01/encodings/predicates.go
@@ -11,15 +11,15 @@ type JobOperationPredicate struct {
 
 func (p JobOperationPredicate) Matches(input Job) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type TransformOperationPredicate struct {
 
 func (p TransformOperationPredicate) Matches(input Transform) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/media/2022-08-01/accountfilters/predicates.go b/resource-manager/media/2022-08-01/accountfilters/predicates.go
index 942b5cd5798..0d50e33a6f3 100644
--- a/resource-manager/media/2022-08-01/accountfilters/predicates.go
+++ b/resource-manager/media/2022-08-01/accountfilters/predicates.go
@@ -11,15 +11,15 @@ type AccountFilterOperationPredicate struct {
 
 func (p AccountFilterOperationPredicate) Matches(input AccountFilter) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/media/2022-08-01/assetsandassetfilters/predicates.go b/resource-manager/media/2022-08-01/assetsandassetfilters/predicates.go
index 221548acada..edfee529cb2 100644
--- a/resource-manager/media/2022-08-01/assetsandassetfilters/predicates.go
+++ b/resource-manager/media/2022-08-01/assetsandassetfilters/predicates.go
@@ -11,15 +11,15 @@ type AssetOperationPredicate struct {
 
 func (p AssetOperationPredicate) Matches(input Asset) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type AssetFilterOperationPredicate struct {
 
 func (p AssetFilterOperationPredicate) Matches(input AssetFilter) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/media/2022-08-01/contentkeypolicies/predicates.go b/resource-manager/media/2022-08-01/contentkeypolicies/predicates.go
index 11a5beb8aa3..4c2e5b15246 100644
--- a/resource-manager/media/2022-08-01/contentkeypolicies/predicates.go
+++ b/resource-manager/media/2022-08-01/contentkeypolicies/predicates.go
@@ -11,15 +11,15 @@ type ContentKeyPolicyOperationPredicate struct {
 
 func (p ContentKeyPolicyOperationPredicate) Matches(input ContentKeyPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/media/2022-08-01/liveevents/predicates.go b/resource-manager/media/2022-08-01/liveevents/predicates.go
index f75518bdb51..6b80594f77e 100644
--- a/resource-manager/media/2022-08-01/liveevents/predicates.go
+++ b/resource-manager/media/2022-08-01/liveevents/predicates.go
@@ -12,7 +12,7 @@ type LiveEventOperationPredicate struct {
 
 func (p LiveEventOperationPredicate) Matches(input LiveEvent) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p LiveEventOperationPredicate) Matches(input LiveEvent) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/media/2022-08-01/liveoutputs/predicates.go b/resource-manager/media/2022-08-01/liveoutputs/predicates.go
index e5f0d7c56e9..1d83a4de688 100644
--- a/resource-manager/media/2022-08-01/liveoutputs/predicates.go
+++ b/resource-manager/media/2022-08-01/liveoutputs/predicates.go
@@ -11,15 +11,15 @@ type LiveOutputOperationPredicate struct {
 
 func (p LiveOutputOperationPredicate) Matches(input LiveOutput) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/media/2022-08-01/streamingendpoints/predicates.go b/resource-manager/media/2022-08-01/streamingendpoints/predicates.go
index 132ecf41e26..9f21dc14d92 100644
--- a/resource-manager/media/2022-08-01/streamingendpoints/predicates.go
+++ b/resource-manager/media/2022-08-01/streamingendpoints/predicates.go
@@ -12,7 +12,7 @@ type StreamingEndpointOperationPredicate struct {
 
 func (p StreamingEndpointOperationPredicate) Matches(input StreamingEndpoint) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p StreamingEndpointOperationPredicate) Matches(input StreamingEndpoint) bo
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/media/2022-08-01/streamingpoliciesandstreaminglocators/predicates.go b/resource-manager/media/2022-08-01/streamingpoliciesandstreaminglocators/predicates.go
index 35871c99210..f5a87258ff4 100644
--- a/resource-manager/media/2022-08-01/streamingpoliciesandstreaminglocators/predicates.go
+++ b/resource-manager/media/2022-08-01/streamingpoliciesandstreaminglocators/predicates.go
@@ -11,15 +11,15 @@ type StreamingLocatorOperationPredicate struct {
 
 func (p StreamingLocatorOperationPredicate) Matches(input StreamingLocator) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type StreamingPolicyOperationPredicate struct {
 
 func (p StreamingPolicyOperationPredicate) Matches(input StreamingPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-01-01/hypervcluster/predicates.go b/resource-manager/migrate/2020-01-01/hypervcluster/predicates.go
index 71e73ff2aed..5b17659e680 100644
--- a/resource-manager/migrate/2020-01-01/hypervcluster/predicates.go
+++ b/resource-manager/migrate/2020-01-01/hypervcluster/predicates.go
@@ -11,15 +11,15 @@ type HyperVClusterOperationPredicate struct {
 
 func (p HyperVClusterOperationPredicate) Matches(input HyperVCluster) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-01-01/hypervhost/predicates.go b/resource-manager/migrate/2020-01-01/hypervhost/predicates.go
index f26804ff7e3..a0305abd6a7 100644
--- a/resource-manager/migrate/2020-01-01/hypervhost/predicates.go
+++ b/resource-manager/migrate/2020-01-01/hypervhost/predicates.go
@@ -11,15 +11,15 @@ type HyperVHostOperationPredicate struct {
 
 func (p HyperVHostOperationPredicate) Matches(input HyperVHost) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-01-01/hypervjobs/predicates.go b/resource-manager/migrate/2020-01-01/hypervjobs/predicates.go
index 5ecfa72f25d..9f38987dca8 100644
--- a/resource-manager/migrate/2020-01-01/hypervjobs/predicates.go
+++ b/resource-manager/migrate/2020-01-01/hypervjobs/predicates.go
@@ -11,15 +11,15 @@ type HyperVJobOperationPredicate struct {
 
 func (p HyperVJobOperationPredicate) Matches(input HyperVJob) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-01-01/hypervmachines/predicates.go b/resource-manager/migrate/2020-01-01/hypervmachines/predicates.go
index f017124f824..87332dd355c 100644
--- a/resource-manager/migrate/2020-01-01/hypervmachines/predicates.go
+++ b/resource-manager/migrate/2020-01-01/hypervmachines/predicates.go
@@ -11,15 +11,15 @@ type HyperVMachineOperationPredicate struct {
 
 func (p HyperVMachineOperationPredicate) Matches(input HyperVMachine) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-01-01/hypervrunasaccounts/predicates.go b/resource-manager/migrate/2020-01-01/hypervrunasaccounts/predicates.go
index c8c70316c26..328488a6b10 100644
--- a/resource-manager/migrate/2020-01-01/hypervrunasaccounts/predicates.go
+++ b/resource-manager/migrate/2020-01-01/hypervrunasaccounts/predicates.go
@@ -11,15 +11,15 @@ type HyperVRunAsAccountOperationPredicate struct {
 
 func (p HyperVRunAsAccountOperationPredicate) Matches(input HyperVRunAsAccount) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-01-01/hypervsites/predicates.go b/resource-manager/migrate/2020-01-01/hypervsites/predicates.go
index e0331a47f49..a6540a0ef24 100644
--- a/resource-manager/migrate/2020-01-01/hypervsites/predicates.go
+++ b/resource-manager/migrate/2020-01-01/hypervsites/predicates.go
@@ -18,43 +18,43 @@ type SiteHealthSummaryOperationPredicate struct {
 
 func (p SiteHealthSummaryOperationPredicate) Matches(input SiteHealthSummary) bool {
 
-	if p.AffectedObjectsCount != nil && (input.AffectedObjectsCount == nil && *p.AffectedObjectsCount != *input.AffectedObjectsCount) {
+	if p.AffectedObjectsCount != nil && (input.AffectedObjectsCount == nil || *p.AffectedObjectsCount != *input.AffectedObjectsCount) {
 		return false
 	}
 
-	if p.AffectedResourceType != nil && (input.AffectedResourceType == nil && *p.AffectedResourceType != *input.AffectedResourceType) {
+	if p.AffectedResourceType != nil && (input.AffectedResourceType == nil || *p.AffectedResourceType != *input.AffectedResourceType) {
 		return false
 	}
 
-	if p.ApplianceName != nil && (input.ApplianceName == nil && *p.ApplianceName != *input.ApplianceName) {
+	if p.ApplianceName != nil && (input.ApplianceName == nil || *p.ApplianceName != *input.ApplianceName) {
 		return false
 	}
 
-	if p.ErrorCode != nil && (input.ErrorCode == nil && *p.ErrorCode != *input.ErrorCode) {
+	if p.ErrorCode != nil && (input.ErrorCode == nil || *p.ErrorCode != *input.ErrorCode) {
 		return false
 	}
 
-	if p.ErrorId != nil && (input.ErrorId == nil && *p.ErrorId != *input.ErrorId) {
+	if p.ErrorId != nil && (input.ErrorId == nil || *p.ErrorId != *input.ErrorId) {
 		return false
 	}
 
-	if p.ErrorMessage != nil && (input.ErrorMessage == nil && *p.ErrorMessage != *input.ErrorMessage) {
+	if p.ErrorMessage != nil && (input.ErrorMessage == nil || *p.ErrorMessage != *input.ErrorMessage) {
 		return false
 	}
 
-	if p.HitCount != nil && (input.HitCount == nil && *p.HitCount != *input.HitCount) {
+	if p.HitCount != nil && (input.HitCount == nil || *p.HitCount != *input.HitCount) {
 		return false
 	}
 
-	if p.RemediationGuidance != nil && (input.RemediationGuidance == nil && *p.RemediationGuidance != *input.RemediationGuidance) {
+	if p.RemediationGuidance != nil && (input.RemediationGuidance == nil || *p.RemediationGuidance != *input.RemediationGuidance) {
 		return false
 	}
 
-	if p.Severity != nil && (input.Severity == nil && *p.Severity != *input.Severity) {
+	if p.Severity != nil && (input.Severity == nil || *p.Severity != *input.Severity) {
 		return false
 	}
 
-	if p.SummaryMessage != nil && (input.SummaryMessage == nil && *p.SummaryMessage != *input.SummaryMessage) {
+	if p.SummaryMessage != nil && (input.SummaryMessage == nil || *p.SummaryMessage != *input.SummaryMessage) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-01-01/jobs/predicates.go b/resource-manager/migrate/2020-01-01/jobs/predicates.go
index efa82564697..2238187478d 100644
--- a/resource-manager/migrate/2020-01-01/jobs/predicates.go
+++ b/resource-manager/migrate/2020-01-01/jobs/predicates.go
@@ -11,15 +11,15 @@ type VMwareJobOperationPredicate struct {
 
 func (p VMwareJobOperationPredicate) Matches(input VMwareJob) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-01-01/machines/predicates.go b/resource-manager/migrate/2020-01-01/machines/predicates.go
index 8b58b0f2f03..2b0d532f563 100644
--- a/resource-manager/migrate/2020-01-01/machines/predicates.go
+++ b/resource-manager/migrate/2020-01-01/machines/predicates.go
@@ -11,15 +11,15 @@ type VMwareMachineOperationPredicate struct {
 
 func (p VMwareMachineOperationPredicate) Matches(input VMwareMachine) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-01-01/runasaccounts/predicates.go b/resource-manager/migrate/2020-01-01/runasaccounts/predicates.go
index d1a8b7a5cff..69ec7fbed70 100644
--- a/resource-manager/migrate/2020-01-01/runasaccounts/predicates.go
+++ b/resource-manager/migrate/2020-01-01/runasaccounts/predicates.go
@@ -11,15 +11,15 @@ type VMwareRunAsAccountOperationPredicate struct {
 
 func (p VMwareRunAsAccountOperationPredicate) Matches(input VMwareRunAsAccount) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-01-01/sites/predicates.go b/resource-manager/migrate/2020-01-01/sites/predicates.go
index 401237d49d6..67ac3baad91 100644
--- a/resource-manager/migrate/2020-01-01/sites/predicates.go
+++ b/resource-manager/migrate/2020-01-01/sites/predicates.go
@@ -18,43 +18,43 @@ type SiteHealthSummaryOperationPredicate struct {
 
 func (p SiteHealthSummaryOperationPredicate) Matches(input SiteHealthSummary) bool {
 
-	if p.AffectedObjectsCount != nil && (input.AffectedObjectsCount == nil && *p.AffectedObjectsCount != *input.AffectedObjectsCount) {
+	if p.AffectedObjectsCount != nil && (input.AffectedObjectsCount == nil || *p.AffectedObjectsCount != *input.AffectedObjectsCount) {
 		return false
 	}
 
-	if p.AffectedResourceType != nil && (input.AffectedResourceType == nil && *p.AffectedResourceType != *input.AffectedResourceType) {
+	if p.AffectedResourceType != nil && (input.AffectedResourceType == nil || *p.AffectedResourceType != *input.AffectedResourceType) {
 		return false
 	}
 
-	if p.ApplianceName != nil && (input.ApplianceName == nil && *p.ApplianceName != *input.ApplianceName) {
+	if p.ApplianceName != nil && (input.ApplianceName == nil || *p.ApplianceName != *input.ApplianceName) {
 		return false
 	}
 
-	if p.ErrorCode != nil && (input.ErrorCode == nil && *p.ErrorCode != *input.ErrorCode) {
+	if p.ErrorCode != nil && (input.ErrorCode == nil || *p.ErrorCode != *input.ErrorCode) {
 		return false
 	}
 
-	if p.ErrorId != nil && (input.ErrorId == nil && *p.ErrorId != *input.ErrorId) {
+	if p.ErrorId != nil && (input.ErrorId == nil || *p.ErrorId != *input.ErrorId) {
 		return false
 	}
 
-	if p.ErrorMessage != nil && (input.ErrorMessage == nil && *p.ErrorMessage != *input.ErrorMessage) {
+	if p.ErrorMessage != nil && (input.ErrorMessage == nil || *p.ErrorMessage != *input.ErrorMessage) {
 		return false
 	}
 
-	if p.HitCount != nil && (input.HitCount == nil && *p.HitCount != *input.HitCount) {
+	if p.HitCount != nil && (input.HitCount == nil || *p.HitCount != *input.HitCount) {
 		return false
 	}
 
-	if p.RemediationGuidance != nil && (input.RemediationGuidance == nil && *p.RemediationGuidance != *input.RemediationGuidance) {
+	if p.RemediationGuidance != nil && (input.RemediationGuidance == nil || *p.RemediationGuidance != *input.RemediationGuidance) {
 		return false
 	}
 
-	if p.Severity != nil && (input.Severity == nil && *p.Severity != *input.Severity) {
+	if p.Severity != nil && (input.Severity == nil || *p.Severity != *input.Severity) {
 		return false
 	}
 
-	if p.SummaryMessage != nil && (input.SummaryMessage == nil && *p.SummaryMessage != *input.SummaryMessage) {
+	if p.SummaryMessage != nil && (input.SummaryMessage == nil || *p.SummaryMessage != *input.SummaryMessage) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-01-01/vcenter/predicates.go b/resource-manager/migrate/2020-01-01/vcenter/predicates.go
index d33d6368490..52ba99e8cc7 100644
--- a/resource-manager/migrate/2020-01-01/vcenter/predicates.go
+++ b/resource-manager/migrate/2020-01-01/vcenter/predicates.go
@@ -11,15 +11,15 @@ type VCenterOperationPredicate struct {
 
 func (p VCenterOperationPredicate) Matches(input VCenter) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-07-07/hypervcluster/predicates.go b/resource-manager/migrate/2020-07-07/hypervcluster/predicates.go
index 71e73ff2aed..5b17659e680 100644
--- a/resource-manager/migrate/2020-07-07/hypervcluster/predicates.go
+++ b/resource-manager/migrate/2020-07-07/hypervcluster/predicates.go
@@ -11,15 +11,15 @@ type HyperVClusterOperationPredicate struct {
 
 func (p HyperVClusterOperationPredicate) Matches(input HyperVCluster) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-07-07/hypervhost/predicates.go b/resource-manager/migrate/2020-07-07/hypervhost/predicates.go
index f26804ff7e3..a0305abd6a7 100644
--- a/resource-manager/migrate/2020-07-07/hypervhost/predicates.go
+++ b/resource-manager/migrate/2020-07-07/hypervhost/predicates.go
@@ -11,15 +11,15 @@ type HyperVHostOperationPredicate struct {
 
 func (p HyperVHostOperationPredicate) Matches(input HyperVHost) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-07-07/hypervjobs/predicates.go b/resource-manager/migrate/2020-07-07/hypervjobs/predicates.go
index 5ecfa72f25d..9f38987dca8 100644
--- a/resource-manager/migrate/2020-07-07/hypervjobs/predicates.go
+++ b/resource-manager/migrate/2020-07-07/hypervjobs/predicates.go
@@ -11,15 +11,15 @@ type HyperVJobOperationPredicate struct {
 
 func (p HyperVJobOperationPredicate) Matches(input HyperVJob) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-07-07/hypervmachines/predicates.go b/resource-manager/migrate/2020-07-07/hypervmachines/predicates.go
index f017124f824..87332dd355c 100644
--- a/resource-manager/migrate/2020-07-07/hypervmachines/predicates.go
+++ b/resource-manager/migrate/2020-07-07/hypervmachines/predicates.go
@@ -11,15 +11,15 @@ type HyperVMachineOperationPredicate struct {
 
 func (p HyperVMachineOperationPredicate) Matches(input HyperVMachine) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-07-07/hypervrunasaccounts/predicates.go b/resource-manager/migrate/2020-07-07/hypervrunasaccounts/predicates.go
index c8c70316c26..328488a6b10 100644
--- a/resource-manager/migrate/2020-07-07/hypervrunasaccounts/predicates.go
+++ b/resource-manager/migrate/2020-07-07/hypervrunasaccounts/predicates.go
@@ -11,15 +11,15 @@ type HyperVRunAsAccountOperationPredicate struct {
 
 func (p HyperVRunAsAccountOperationPredicate) Matches(input HyperVRunAsAccount) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-07-07/hypervsites/predicates.go b/resource-manager/migrate/2020-07-07/hypervsites/predicates.go
index e0331a47f49..a6540a0ef24 100644
--- a/resource-manager/migrate/2020-07-07/hypervsites/predicates.go
+++ b/resource-manager/migrate/2020-07-07/hypervsites/predicates.go
@@ -18,43 +18,43 @@ type SiteHealthSummaryOperationPredicate struct {
 
 func (p SiteHealthSummaryOperationPredicate) Matches(input SiteHealthSummary) bool {
 
-	if p.AffectedObjectsCount != nil && (input.AffectedObjectsCount == nil && *p.AffectedObjectsCount != *input.AffectedObjectsCount) {
+	if p.AffectedObjectsCount != nil && (input.AffectedObjectsCount == nil || *p.AffectedObjectsCount != *input.AffectedObjectsCount) {
 		return false
 	}
 
-	if p.AffectedResourceType != nil && (input.AffectedResourceType == nil && *p.AffectedResourceType != *input.AffectedResourceType) {
+	if p.AffectedResourceType != nil && (input.AffectedResourceType == nil || *p.AffectedResourceType != *input.AffectedResourceType) {
 		return false
 	}
 
-	if p.ApplianceName != nil && (input.ApplianceName == nil && *p.ApplianceName != *input.ApplianceName) {
+	if p.ApplianceName != nil && (input.ApplianceName == nil || *p.ApplianceName != *input.ApplianceName) {
 		return false
 	}
 
-	if p.ErrorCode != nil && (input.ErrorCode == nil && *p.ErrorCode != *input.ErrorCode) {
+	if p.ErrorCode != nil && (input.ErrorCode == nil || *p.ErrorCode != *input.ErrorCode) {
 		return false
 	}
 
-	if p.ErrorId != nil && (input.ErrorId == nil && *p.ErrorId != *input.ErrorId) {
+	if p.ErrorId != nil && (input.ErrorId == nil || *p.ErrorId != *input.ErrorId) {
 		return false
 	}
 
-	if p.ErrorMessage != nil && (input.ErrorMessage == nil && *p.ErrorMessage != *input.ErrorMessage) {
+	if p.ErrorMessage != nil && (input.ErrorMessage == nil || *p.ErrorMessage != *input.ErrorMessage) {
 		return false
 	}
 
-	if p.HitCount != nil && (input.HitCount == nil && *p.HitCount != *input.HitCount) {
+	if p.HitCount != nil && (input.HitCount == nil || *p.HitCount != *input.HitCount) {
 		return false
 	}
 
-	if p.RemediationGuidance != nil && (input.RemediationGuidance == nil && *p.RemediationGuidance != *input.RemediationGuidance) {
+	if p.RemediationGuidance != nil && (input.RemediationGuidance == nil || *p.RemediationGuidance != *input.RemediationGuidance) {
 		return false
 	}
 
-	if p.Severity != nil && (input.Severity == nil && *p.Severity != *input.Severity) {
+	if p.Severity != nil && (input.Severity == nil || *p.Severity != *input.Severity) {
 		return false
 	}
 
-	if p.SummaryMessage != nil && (input.SummaryMessage == nil && *p.SummaryMessage != *input.SummaryMessage) {
+	if p.SummaryMessage != nil && (input.SummaryMessage == nil || *p.SummaryMessage != *input.SummaryMessage) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-07-07/jobs/predicates.go b/resource-manager/migrate/2020-07-07/jobs/predicates.go
index efa82564697..2238187478d 100644
--- a/resource-manager/migrate/2020-07-07/jobs/predicates.go
+++ b/resource-manager/migrate/2020-07-07/jobs/predicates.go
@@ -11,15 +11,15 @@ type VMwareJobOperationPredicate struct {
 
 func (p VMwareJobOperationPredicate) Matches(input VMwareJob) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-07-07/machines/predicates.go b/resource-manager/migrate/2020-07-07/machines/predicates.go
index 8b58b0f2f03..2b0d532f563 100644
--- a/resource-manager/migrate/2020-07-07/machines/predicates.go
+++ b/resource-manager/migrate/2020-07-07/machines/predicates.go
@@ -11,15 +11,15 @@ type VMwareMachineOperationPredicate struct {
 
 func (p VMwareMachineOperationPredicate) Matches(input VMwareMachine) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-07-07/mastersites/predicates.go b/resource-manager/migrate/2020-07-07/mastersites/predicates.go
index 7e36dc42e66..831823561be 100644
--- a/resource-manager/migrate/2020-07-07/mastersites/predicates.go
+++ b/resource-manager/migrate/2020-07-07/mastersites/predicates.go
@@ -13,23 +13,23 @@ type MasterSiteOperationPredicate struct {
 
 func (p MasterSiteOperationPredicate) Matches(input MasterSite) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-07-07/migrates/predicates.go b/resource-manager/migrate/2020-07-07/migrates/predicates.go
index 7f7dce7acb6..65878279921 100644
--- a/resource-manager/migrate/2020-07-07/migrates/predicates.go
+++ b/resource-manager/migrate/2020-07-07/migrates/predicates.go
@@ -13,23 +13,23 @@ type HyperVSiteOperationPredicate struct {
 
 func (p HyperVSiteOperationPredicate) Matches(input HyperVSite) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -46,23 +46,23 @@ type VMwareSiteOperationPredicate struct {
 
 func (p VMwareSiteOperationPredicate) Matches(input VMwareSite) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-07-07/runasaccounts/predicates.go b/resource-manager/migrate/2020-07-07/runasaccounts/predicates.go
index d1a8b7a5cff..69ec7fbed70 100644
--- a/resource-manager/migrate/2020-07-07/runasaccounts/predicates.go
+++ b/resource-manager/migrate/2020-07-07/runasaccounts/predicates.go
@@ -11,15 +11,15 @@ type VMwareRunAsAccountOperationPredicate struct {
 
 func (p VMwareRunAsAccountOperationPredicate) Matches(input VMwareRunAsAccount) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-07-07/sites/predicates.go b/resource-manager/migrate/2020-07-07/sites/predicates.go
index 401237d49d6..67ac3baad91 100644
--- a/resource-manager/migrate/2020-07-07/sites/predicates.go
+++ b/resource-manager/migrate/2020-07-07/sites/predicates.go
@@ -18,43 +18,43 @@ type SiteHealthSummaryOperationPredicate struct {
 
 func (p SiteHealthSummaryOperationPredicate) Matches(input SiteHealthSummary) bool {
 
-	if p.AffectedObjectsCount != nil && (input.AffectedObjectsCount == nil && *p.AffectedObjectsCount != *input.AffectedObjectsCount) {
+	if p.AffectedObjectsCount != nil && (input.AffectedObjectsCount == nil || *p.AffectedObjectsCount != *input.AffectedObjectsCount) {
 		return false
 	}
 
-	if p.AffectedResourceType != nil && (input.AffectedResourceType == nil && *p.AffectedResourceType != *input.AffectedResourceType) {
+	if p.AffectedResourceType != nil && (input.AffectedResourceType == nil || *p.AffectedResourceType != *input.AffectedResourceType) {
 		return false
 	}
 
-	if p.ApplianceName != nil && (input.ApplianceName == nil && *p.ApplianceName != *input.ApplianceName) {
+	if p.ApplianceName != nil && (input.ApplianceName == nil || *p.ApplianceName != *input.ApplianceName) {
 		return false
 	}
 
-	if p.ErrorCode != nil && (input.ErrorCode == nil && *p.ErrorCode != *input.ErrorCode) {
+	if p.ErrorCode != nil && (input.ErrorCode == nil || *p.ErrorCode != *input.ErrorCode) {
 		return false
 	}
 
-	if p.ErrorId != nil && (input.ErrorId == nil && *p.ErrorId != *input.ErrorId) {
+	if p.ErrorId != nil && (input.ErrorId == nil || *p.ErrorId != *input.ErrorId) {
 		return false
 	}
 
-	if p.ErrorMessage != nil && (input.ErrorMessage == nil && *p.ErrorMessage != *input.ErrorMessage) {
+	if p.ErrorMessage != nil && (input.ErrorMessage == nil || *p.ErrorMessage != *input.ErrorMessage) {
 		return false
 	}
 
-	if p.HitCount != nil && (input.HitCount == nil && *p.HitCount != *input.HitCount) {
+	if p.HitCount != nil && (input.HitCount == nil || *p.HitCount != *input.HitCount) {
 		return false
 	}
 
-	if p.RemediationGuidance != nil && (input.RemediationGuidance == nil && *p.RemediationGuidance != *input.RemediationGuidance) {
+	if p.RemediationGuidance != nil && (input.RemediationGuidance == nil || *p.RemediationGuidance != *input.RemediationGuidance) {
 		return false
 	}
 
-	if p.Severity != nil && (input.Severity == nil && *p.Severity != *input.Severity) {
+	if p.Severity != nil && (input.Severity == nil || *p.Severity != *input.Severity) {
 		return false
 	}
 
-	if p.SummaryMessage != nil && (input.SummaryMessage == nil && *p.SummaryMessage != *input.SummaryMessage) {
+	if p.SummaryMessage != nil && (input.SummaryMessage == nil || *p.SummaryMessage != *input.SummaryMessage) {
 		return false
 	}
 
diff --git a/resource-manager/migrate/2020-07-07/vcenter/predicates.go b/resource-manager/migrate/2020-07-07/vcenter/predicates.go
index d33d6368490..52ba99e8cc7 100644
--- a/resource-manager/migrate/2020-07-07/vcenter/predicates.go
+++ b/resource-manager/migrate/2020-07-07/vcenter/predicates.go
@@ -11,15 +11,15 @@ type VCenterOperationPredicate struct {
 
 func (p VCenterOperationPredicate) Matches(input VCenter) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mixedreality/2021-01-01/proxy/predicates.go b/resource-manager/mixedreality/2021-01-01/proxy/predicates.go
index ca1de840b89..193cef426ad 100644
--- a/resource-manager/mixedreality/2021-01-01/proxy/predicates.go
+++ b/resource-manager/mixedreality/2021-01-01/proxy/predicates.go
@@ -12,7 +12,7 @@ type RemoteRenderingAccountOperationPredicate struct {
 
 func (p RemoteRenderingAccountOperationPredicate) Matches(input RemoteRenderingAccount) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p RemoteRenderingAccountOperationPredicate) Matches(input RemoteRenderingA
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,7 +40,7 @@ type SpatialAnchorsAccountOperationPredicate struct {
 
 func (p SpatialAnchorsAccountOperationPredicate) Matches(input SpatialAnchorsAccount) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -48,11 +48,11 @@ func (p SpatialAnchorsAccountOperationPredicate) Matches(input SpatialAnchorsAcc
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mixedreality/2021-01-01/resource/predicates.go b/resource-manager/mixedreality/2021-01-01/resource/predicates.go
index 3f845c21be0..0a87dca95da 100644
--- a/resource-manager/mixedreality/2021-01-01/resource/predicates.go
+++ b/resource-manager/mixedreality/2021-01-01/resource/predicates.go
@@ -12,7 +12,7 @@ type RemoteRenderingAccountOperationPredicate struct {
 
 func (p RemoteRenderingAccountOperationPredicate) Matches(input RemoteRenderingAccount) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p RemoteRenderingAccountOperationPredicate) Matches(input RemoteRenderingA
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,7 +40,7 @@ type SpatialAnchorsAccountOperationPredicate struct {
 
 func (p SpatialAnchorsAccountOperationPredicate) Matches(input SpatialAnchorsAccount) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -48,11 +48,11 @@ func (p SpatialAnchorsAccountOperationPredicate) Matches(input SpatialAnchorsAcc
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2022-11-01/attacheddatanetworks/predicates.go b/resource-manager/mobilenetwork/2022-11-01/attacheddatanetworks/predicates.go
index ade310b462a..061b9c0fb30 100644
--- a/resource-manager/mobilenetwork/2022-11-01/attacheddatanetworks/predicates.go
+++ b/resource-manager/mobilenetwork/2022-11-01/attacheddatanetworks/predicates.go
@@ -12,7 +12,7 @@ type AttachedDataNetworkOperationPredicate struct {
 
 func (p AttachedDataNetworkOperationPredicate) Matches(input AttachedDataNetwork) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p AttachedDataNetworkOperationPredicate) Matches(input AttachedDataNetwork
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2022-11-01/datanetworks/predicates.go b/resource-manager/mobilenetwork/2022-11-01/datanetworks/predicates.go
index 53dd1244989..cea221f8730 100644
--- a/resource-manager/mobilenetwork/2022-11-01/datanetworks/predicates.go
+++ b/resource-manager/mobilenetwork/2022-11-01/datanetworks/predicates.go
@@ -12,7 +12,7 @@ type DataNetworkOperationPredicate struct {
 
 func (p DataNetworkOperationPredicate) Matches(input DataNetwork) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p DataNetworkOperationPredicate) Matches(input DataNetwork) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2022-11-01/mobilenetworks/predicates.go b/resource-manager/mobilenetwork/2022-11-01/mobilenetworks/predicates.go
index db7ef92f07a..43caeb7c5b5 100644
--- a/resource-manager/mobilenetwork/2022-11-01/mobilenetworks/predicates.go
+++ b/resource-manager/mobilenetwork/2022-11-01/mobilenetworks/predicates.go
@@ -12,7 +12,7 @@ type MobileNetworkOperationPredicate struct {
 
 func (p MobileNetworkOperationPredicate) Matches(input MobileNetwork) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p MobileNetworkOperationPredicate) Matches(input MobileNetwork) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2022-11-01/packetcorecontrolplanes/predicates.go b/resource-manager/mobilenetwork/2022-11-01/packetcorecontrolplanes/predicates.go
index 0afe229beb0..66e19af8dbc 100644
--- a/resource-manager/mobilenetwork/2022-11-01/packetcorecontrolplanes/predicates.go
+++ b/resource-manager/mobilenetwork/2022-11-01/packetcorecontrolplanes/predicates.go
@@ -12,7 +12,7 @@ type PacketCoreControlPlaneOperationPredicate struct {
 
 func (p PacketCoreControlPlaneOperationPredicate) Matches(input PacketCoreControlPlane) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p PacketCoreControlPlaneOperationPredicate) Matches(input PacketCoreContro
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2022-11-01/packetcorecontrolplaneversion/predicates.go b/resource-manager/mobilenetwork/2022-11-01/packetcorecontrolplaneversion/predicates.go
index 8c00bef6551..63260f5ad22 100644
--- a/resource-manager/mobilenetwork/2022-11-01/packetcorecontrolplaneversion/predicates.go
+++ b/resource-manager/mobilenetwork/2022-11-01/packetcorecontrolplaneversion/predicates.go
@@ -11,15 +11,15 @@ type PacketCoreControlPlaneVersionOperationPredicate struct {
 
 func (p PacketCoreControlPlaneVersionOperationPredicate) Matches(input PacketCoreControlPlaneVersion) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2022-11-01/packetcoredataplanes/predicates.go b/resource-manager/mobilenetwork/2022-11-01/packetcoredataplanes/predicates.go
index fcd0dfae21c..f14d328d091 100644
--- a/resource-manager/mobilenetwork/2022-11-01/packetcoredataplanes/predicates.go
+++ b/resource-manager/mobilenetwork/2022-11-01/packetcoredataplanes/predicates.go
@@ -12,7 +12,7 @@ type PacketCoreDataPlaneOperationPredicate struct {
 
 func (p PacketCoreDataPlaneOperationPredicate) Matches(input PacketCoreDataPlane) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p PacketCoreDataPlaneOperationPredicate) Matches(input PacketCoreDataPlane
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2022-11-01/services/predicates.go b/resource-manager/mobilenetwork/2022-11-01/services/predicates.go
index 10e2c110a7b..ab4d1a7dcf6 100644
--- a/resource-manager/mobilenetwork/2022-11-01/services/predicates.go
+++ b/resource-manager/mobilenetwork/2022-11-01/services/predicates.go
@@ -12,7 +12,7 @@ type ServiceOperationPredicate struct {
 
 func (p ServiceOperationPredicate) Matches(input Service) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ServiceOperationPredicate) Matches(input Service) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2022-11-01/simgroups/predicates.go b/resource-manager/mobilenetwork/2022-11-01/simgroups/predicates.go
index 0f666dc2c39..8366b98bf49 100644
--- a/resource-manager/mobilenetwork/2022-11-01/simgroups/predicates.go
+++ b/resource-manager/mobilenetwork/2022-11-01/simgroups/predicates.go
@@ -12,7 +12,7 @@ type SimGroupOperationPredicate struct {
 
 func (p SimGroupOperationPredicate) Matches(input SimGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SimGroupOperationPredicate) Matches(input SimGroup) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2022-11-01/simpolicies/predicates.go b/resource-manager/mobilenetwork/2022-11-01/simpolicies/predicates.go
index 75d31ec3c47..6f42f616168 100644
--- a/resource-manager/mobilenetwork/2022-11-01/simpolicies/predicates.go
+++ b/resource-manager/mobilenetwork/2022-11-01/simpolicies/predicates.go
@@ -12,7 +12,7 @@ type SimPolicyOperationPredicate struct {
 
 func (p SimPolicyOperationPredicate) Matches(input SimPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SimPolicyOperationPredicate) Matches(input SimPolicy) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2022-11-01/sims/predicates.go b/resource-manager/mobilenetwork/2022-11-01/sims/predicates.go
index 5936cb4e74a..bf9181149d9 100644
--- a/resource-manager/mobilenetwork/2022-11-01/sims/predicates.go
+++ b/resource-manager/mobilenetwork/2022-11-01/sims/predicates.go
@@ -11,15 +11,15 @@ type SimOperationPredicate struct {
 
 func (p SimOperationPredicate) Matches(input Sim) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2022-11-01/sites/predicates.go b/resource-manager/mobilenetwork/2022-11-01/sites/predicates.go
index 520ab2748a0..0b1a7c0531c 100644
--- a/resource-manager/mobilenetwork/2022-11-01/sites/predicates.go
+++ b/resource-manager/mobilenetwork/2022-11-01/sites/predicates.go
@@ -12,7 +12,7 @@ type SiteOperationPredicate struct {
 
 func (p SiteOperationPredicate) Matches(input Site) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SiteOperationPredicate) Matches(input Site) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2022-11-01/slices/predicates.go b/resource-manager/mobilenetwork/2022-11-01/slices/predicates.go
index 32e80957cfe..939ec9408b6 100644
--- a/resource-manager/mobilenetwork/2022-11-01/slices/predicates.go
+++ b/resource-manager/mobilenetwork/2022-11-01/slices/predicates.go
@@ -12,7 +12,7 @@ type SliceOperationPredicate struct {
 
 func (p SliceOperationPredicate) Matches(input Slice) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SliceOperationPredicate) Matches(input Slice) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2023-06-01/attacheddatanetworks/predicates.go b/resource-manager/mobilenetwork/2023-06-01/attacheddatanetworks/predicates.go
index ade310b462a..061b9c0fb30 100644
--- a/resource-manager/mobilenetwork/2023-06-01/attacheddatanetworks/predicates.go
+++ b/resource-manager/mobilenetwork/2023-06-01/attacheddatanetworks/predicates.go
@@ -12,7 +12,7 @@ type AttachedDataNetworkOperationPredicate struct {
 
 func (p AttachedDataNetworkOperationPredicate) Matches(input AttachedDataNetwork) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p AttachedDataNetworkOperationPredicate) Matches(input AttachedDataNetwork
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2023-06-01/datanetworks/predicates.go b/resource-manager/mobilenetwork/2023-06-01/datanetworks/predicates.go
index 53dd1244989..cea221f8730 100644
--- a/resource-manager/mobilenetwork/2023-06-01/datanetworks/predicates.go
+++ b/resource-manager/mobilenetwork/2023-06-01/datanetworks/predicates.go
@@ -12,7 +12,7 @@ type DataNetworkOperationPredicate struct {
 
 func (p DataNetworkOperationPredicate) Matches(input DataNetwork) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p DataNetworkOperationPredicate) Matches(input DataNetwork) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2023-06-01/diagnosticspackages/predicates.go b/resource-manager/mobilenetwork/2023-06-01/diagnosticspackages/predicates.go
index d8afbe2ccbb..3d751659ab0 100644
--- a/resource-manager/mobilenetwork/2023-06-01/diagnosticspackages/predicates.go
+++ b/resource-manager/mobilenetwork/2023-06-01/diagnosticspackages/predicates.go
@@ -11,15 +11,15 @@ type DiagnosticsPackageOperationPredicate struct {
 
 func (p DiagnosticsPackageOperationPredicate) Matches(input DiagnosticsPackage) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2023-06-01/mobilenetworks/predicates.go b/resource-manager/mobilenetwork/2023-06-01/mobilenetworks/predicates.go
index db7ef92f07a..43caeb7c5b5 100644
--- a/resource-manager/mobilenetwork/2023-06-01/mobilenetworks/predicates.go
+++ b/resource-manager/mobilenetwork/2023-06-01/mobilenetworks/predicates.go
@@ -12,7 +12,7 @@ type MobileNetworkOperationPredicate struct {
 
 func (p MobileNetworkOperationPredicate) Matches(input MobileNetwork) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p MobileNetworkOperationPredicate) Matches(input MobileNetwork) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2023-06-01/packetcaptures/predicates.go b/resource-manager/mobilenetwork/2023-06-01/packetcaptures/predicates.go
index 64c01064c40..c12967b6cc3 100644
--- a/resource-manager/mobilenetwork/2023-06-01/packetcaptures/predicates.go
+++ b/resource-manager/mobilenetwork/2023-06-01/packetcaptures/predicates.go
@@ -11,15 +11,15 @@ type PacketCaptureOperationPredicate struct {
 
 func (p PacketCaptureOperationPredicate) Matches(input PacketCapture) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2023-06-01/packetcorecontrolplanes/predicates.go b/resource-manager/mobilenetwork/2023-06-01/packetcorecontrolplanes/predicates.go
index 0afe229beb0..66e19af8dbc 100644
--- a/resource-manager/mobilenetwork/2023-06-01/packetcorecontrolplanes/predicates.go
+++ b/resource-manager/mobilenetwork/2023-06-01/packetcorecontrolplanes/predicates.go
@@ -12,7 +12,7 @@ type PacketCoreControlPlaneOperationPredicate struct {
 
 func (p PacketCoreControlPlaneOperationPredicate) Matches(input PacketCoreControlPlane) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p PacketCoreControlPlaneOperationPredicate) Matches(input PacketCoreContro
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2023-06-01/packetcorecontrolplaneversion/predicates.go b/resource-manager/mobilenetwork/2023-06-01/packetcorecontrolplaneversion/predicates.go
index 8c00bef6551..63260f5ad22 100644
--- a/resource-manager/mobilenetwork/2023-06-01/packetcorecontrolplaneversion/predicates.go
+++ b/resource-manager/mobilenetwork/2023-06-01/packetcorecontrolplaneversion/predicates.go
@@ -11,15 +11,15 @@ type PacketCoreControlPlaneVersionOperationPredicate struct {
 
 func (p PacketCoreControlPlaneVersionOperationPredicate) Matches(input PacketCoreControlPlaneVersion) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2023-06-01/packetcoredataplanes/predicates.go b/resource-manager/mobilenetwork/2023-06-01/packetcoredataplanes/predicates.go
index fcd0dfae21c..f14d328d091 100644
--- a/resource-manager/mobilenetwork/2023-06-01/packetcoredataplanes/predicates.go
+++ b/resource-manager/mobilenetwork/2023-06-01/packetcoredataplanes/predicates.go
@@ -12,7 +12,7 @@ type PacketCoreDataPlaneOperationPredicate struct {
 
 func (p PacketCoreDataPlaneOperationPredicate) Matches(input PacketCoreDataPlane) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p PacketCoreDataPlaneOperationPredicate) Matches(input PacketCoreDataPlane
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2023-06-01/services/predicates.go b/resource-manager/mobilenetwork/2023-06-01/services/predicates.go
index 10e2c110a7b..ab4d1a7dcf6 100644
--- a/resource-manager/mobilenetwork/2023-06-01/services/predicates.go
+++ b/resource-manager/mobilenetwork/2023-06-01/services/predicates.go
@@ -12,7 +12,7 @@ type ServiceOperationPredicate struct {
 
 func (p ServiceOperationPredicate) Matches(input Service) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ServiceOperationPredicate) Matches(input Service) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2023-06-01/simgroups/predicates.go b/resource-manager/mobilenetwork/2023-06-01/simgroups/predicates.go
index 0f666dc2c39..8366b98bf49 100644
--- a/resource-manager/mobilenetwork/2023-06-01/simgroups/predicates.go
+++ b/resource-manager/mobilenetwork/2023-06-01/simgroups/predicates.go
@@ -12,7 +12,7 @@ type SimGroupOperationPredicate struct {
 
 func (p SimGroupOperationPredicate) Matches(input SimGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SimGroupOperationPredicate) Matches(input SimGroup) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2023-06-01/simpolicies/predicates.go b/resource-manager/mobilenetwork/2023-06-01/simpolicies/predicates.go
index 75d31ec3c47..6f42f616168 100644
--- a/resource-manager/mobilenetwork/2023-06-01/simpolicies/predicates.go
+++ b/resource-manager/mobilenetwork/2023-06-01/simpolicies/predicates.go
@@ -12,7 +12,7 @@ type SimPolicyOperationPredicate struct {
 
 func (p SimPolicyOperationPredicate) Matches(input SimPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SimPolicyOperationPredicate) Matches(input SimPolicy) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2023-06-01/sims/predicates.go b/resource-manager/mobilenetwork/2023-06-01/sims/predicates.go
index 5936cb4e74a..bf9181149d9 100644
--- a/resource-manager/mobilenetwork/2023-06-01/sims/predicates.go
+++ b/resource-manager/mobilenetwork/2023-06-01/sims/predicates.go
@@ -11,15 +11,15 @@ type SimOperationPredicate struct {
 
 func (p SimOperationPredicate) Matches(input Sim) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2023-06-01/sites/predicates.go b/resource-manager/mobilenetwork/2023-06-01/sites/predicates.go
index 520ab2748a0..0b1a7c0531c 100644
--- a/resource-manager/mobilenetwork/2023-06-01/sites/predicates.go
+++ b/resource-manager/mobilenetwork/2023-06-01/sites/predicates.go
@@ -12,7 +12,7 @@ type SiteOperationPredicate struct {
 
 func (p SiteOperationPredicate) Matches(input Site) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SiteOperationPredicate) Matches(input Site) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mobilenetwork/2023-06-01/slices/predicates.go b/resource-manager/mobilenetwork/2023-06-01/slices/predicates.go
index 32e80957cfe..939ec9408b6 100644
--- a/resource-manager/mobilenetwork/2023-06-01/slices/predicates.go
+++ b/resource-manager/mobilenetwork/2023-06-01/slices/predicates.go
@@ -12,7 +12,7 @@ type SliceOperationPredicate struct {
 
 func (p SliceOperationPredicate) Matches(input Slice) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SliceOperationPredicate) Matches(input Slice) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mysql/2021-05-01/backups/predicates.go b/resource-manager/mysql/2021-05-01/backups/predicates.go
index cf0ae2ed13b..8dd0c0c5c20 100644
--- a/resource-manager/mysql/2021-05-01/backups/predicates.go
+++ b/resource-manager/mysql/2021-05-01/backups/predicates.go
@@ -11,15 +11,15 @@ type ServerBackupOperationPredicate struct {
 
 func (p ServerBackupOperationPredicate) Matches(input ServerBackup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mysql/2021-05-01/configurations/predicates.go b/resource-manager/mysql/2021-05-01/configurations/predicates.go
index 4e755074739..4ff843ebaef 100644
--- a/resource-manager/mysql/2021-05-01/configurations/predicates.go
+++ b/resource-manager/mysql/2021-05-01/configurations/predicates.go
@@ -11,15 +11,15 @@ type ConfigurationOperationPredicate struct {
 
 func (p ConfigurationOperationPredicate) Matches(input Configuration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mysql/2021-05-01/databases/predicates.go b/resource-manager/mysql/2021-05-01/databases/predicates.go
index 76a8d6409f3..3d55136d0fb 100644
--- a/resource-manager/mysql/2021-05-01/databases/predicates.go
+++ b/resource-manager/mysql/2021-05-01/databases/predicates.go
@@ -11,15 +11,15 @@ type DatabaseOperationPredicate struct {
 
 func (p DatabaseOperationPredicate) Matches(input Database) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mysql/2021-05-01/firewallrules/predicates.go b/resource-manager/mysql/2021-05-01/firewallrules/predicates.go
index 1c6d22830c2..fb7011b1d3b 100644
--- a/resource-manager/mysql/2021-05-01/firewallrules/predicates.go
+++ b/resource-manager/mysql/2021-05-01/firewallrules/predicates.go
@@ -11,15 +11,15 @@ type FirewallRuleOperationPredicate struct {
 
 func (p FirewallRuleOperationPredicate) Matches(input FirewallRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mysql/2021-05-01/servers/predicates.go b/resource-manager/mysql/2021-05-01/servers/predicates.go
index 9cb84cf6466..8b49f30ccbe 100644
--- a/resource-manager/mysql/2021-05-01/servers/predicates.go
+++ b/resource-manager/mysql/2021-05-01/servers/predicates.go
@@ -12,7 +12,7 @@ type ServerOperationPredicate struct {
 
 func (p ServerOperationPredicate) Matches(input Server) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ServerOperationPredicate) Matches(input Server) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mysql/2021-12-01-preview/azureadadministrators/predicates.go b/resource-manager/mysql/2021-12-01-preview/azureadadministrators/predicates.go
index 562c1be0a98..56c8e0ead8b 100644
--- a/resource-manager/mysql/2021-12-01-preview/azureadadministrators/predicates.go
+++ b/resource-manager/mysql/2021-12-01-preview/azureadadministrators/predicates.go
@@ -11,15 +11,15 @@ type AzureADAdministratorOperationPredicate struct {
 
 func (p AzureADAdministratorOperationPredicate) Matches(input AzureADAdministrator) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mysql/2021-12-01-preview/backups/predicates.go b/resource-manager/mysql/2021-12-01-preview/backups/predicates.go
index cf0ae2ed13b..8dd0c0c5c20 100644
--- a/resource-manager/mysql/2021-12-01-preview/backups/predicates.go
+++ b/resource-manager/mysql/2021-12-01-preview/backups/predicates.go
@@ -11,15 +11,15 @@ type ServerBackupOperationPredicate struct {
 
 func (p ServerBackupOperationPredicate) Matches(input ServerBackup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mysql/2021-12-01-preview/configurations/predicates.go b/resource-manager/mysql/2021-12-01-preview/configurations/predicates.go
index 4e755074739..4ff843ebaef 100644
--- a/resource-manager/mysql/2021-12-01-preview/configurations/predicates.go
+++ b/resource-manager/mysql/2021-12-01-preview/configurations/predicates.go
@@ -11,15 +11,15 @@ type ConfigurationOperationPredicate struct {
 
 func (p ConfigurationOperationPredicate) Matches(input Configuration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mysql/2021-12-01-preview/databases/predicates.go b/resource-manager/mysql/2021-12-01-preview/databases/predicates.go
index 76a8d6409f3..3d55136d0fb 100644
--- a/resource-manager/mysql/2021-12-01-preview/databases/predicates.go
+++ b/resource-manager/mysql/2021-12-01-preview/databases/predicates.go
@@ -11,15 +11,15 @@ type DatabaseOperationPredicate struct {
 
 func (p DatabaseOperationPredicate) Matches(input Database) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mysql/2021-12-01-preview/firewallrules/predicates.go b/resource-manager/mysql/2021-12-01-preview/firewallrules/predicates.go
index 1c6d22830c2..fb7011b1d3b 100644
--- a/resource-manager/mysql/2021-12-01-preview/firewallrules/predicates.go
+++ b/resource-manager/mysql/2021-12-01-preview/firewallrules/predicates.go
@@ -11,15 +11,15 @@ type FirewallRuleOperationPredicate struct {
 
 func (p FirewallRuleOperationPredicate) Matches(input FirewallRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mysql/2021-12-01-preview/logfiles/predicates.go b/resource-manager/mysql/2021-12-01-preview/logfiles/predicates.go
index dda1da1cf44..3b4f9690c5d 100644
--- a/resource-manager/mysql/2021-12-01-preview/logfiles/predicates.go
+++ b/resource-manager/mysql/2021-12-01-preview/logfiles/predicates.go
@@ -11,15 +11,15 @@ type LogFileOperationPredicate struct {
 
 func (p LogFileOperationPredicate) Matches(input LogFile) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mysql/2021-12-01-preview/servers/predicates.go b/resource-manager/mysql/2021-12-01-preview/servers/predicates.go
index 9cb84cf6466..8b49f30ccbe 100644
--- a/resource-manager/mysql/2021-12-01-preview/servers/predicates.go
+++ b/resource-manager/mysql/2021-12-01-preview/servers/predicates.go
@@ -12,7 +12,7 @@ type ServerOperationPredicate struct {
 
 func (p ServerOperationPredicate) Matches(input Server) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ServerOperationPredicate) Matches(input Server) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mysql/2022-01-01/azureadadministrators/predicates.go b/resource-manager/mysql/2022-01-01/azureadadministrators/predicates.go
index 562c1be0a98..56c8e0ead8b 100644
--- a/resource-manager/mysql/2022-01-01/azureadadministrators/predicates.go
+++ b/resource-manager/mysql/2022-01-01/azureadadministrators/predicates.go
@@ -11,15 +11,15 @@ type AzureADAdministratorOperationPredicate struct {
 
 func (p AzureADAdministratorOperationPredicate) Matches(input AzureADAdministrator) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mysql/2022-01-01/backups/predicates.go b/resource-manager/mysql/2022-01-01/backups/predicates.go
index cf0ae2ed13b..8dd0c0c5c20 100644
--- a/resource-manager/mysql/2022-01-01/backups/predicates.go
+++ b/resource-manager/mysql/2022-01-01/backups/predicates.go
@@ -11,15 +11,15 @@ type ServerBackupOperationPredicate struct {
 
 func (p ServerBackupOperationPredicate) Matches(input ServerBackup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mysql/2022-01-01/configurations/predicates.go b/resource-manager/mysql/2022-01-01/configurations/predicates.go
index 4e755074739..4ff843ebaef 100644
--- a/resource-manager/mysql/2022-01-01/configurations/predicates.go
+++ b/resource-manager/mysql/2022-01-01/configurations/predicates.go
@@ -11,15 +11,15 @@ type ConfigurationOperationPredicate struct {
 
 func (p ConfigurationOperationPredicate) Matches(input Configuration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mysql/2022-01-01/databases/predicates.go b/resource-manager/mysql/2022-01-01/databases/predicates.go
index 76a8d6409f3..3d55136d0fb 100644
--- a/resource-manager/mysql/2022-01-01/databases/predicates.go
+++ b/resource-manager/mysql/2022-01-01/databases/predicates.go
@@ -11,15 +11,15 @@ type DatabaseOperationPredicate struct {
 
 func (p DatabaseOperationPredicate) Matches(input Database) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mysql/2022-01-01/firewallrules/predicates.go b/resource-manager/mysql/2022-01-01/firewallrules/predicates.go
index 1c6d22830c2..fb7011b1d3b 100644
--- a/resource-manager/mysql/2022-01-01/firewallrules/predicates.go
+++ b/resource-manager/mysql/2022-01-01/firewallrules/predicates.go
@@ -11,15 +11,15 @@ type FirewallRuleOperationPredicate struct {
 
 func (p FirewallRuleOperationPredicate) Matches(input FirewallRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mysql/2022-01-01/logfiles/predicates.go b/resource-manager/mysql/2022-01-01/logfiles/predicates.go
index dda1da1cf44..3b4f9690c5d 100644
--- a/resource-manager/mysql/2022-01-01/logfiles/predicates.go
+++ b/resource-manager/mysql/2022-01-01/logfiles/predicates.go
@@ -11,15 +11,15 @@ type LogFileOperationPredicate struct {
 
 func (p LogFileOperationPredicate) Matches(input LogFile) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/mysql/2022-01-01/servers/predicates.go b/resource-manager/mysql/2022-01-01/servers/predicates.go
index 9cb84cf6466..8b49f30ccbe 100644
--- a/resource-manager/mysql/2022-01-01/servers/predicates.go
+++ b/resource-manager/mysql/2022-01-01/servers/predicates.go
@@ -12,7 +12,7 @@ type ServerOperationPredicate struct {
 
 func (p ServerOperationPredicate) Matches(input Server) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ServerOperationPredicate) Matches(input Server) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/netapp/2021-10-01/capacitypools/predicates.go b/resource-manager/netapp/2021-10-01/capacitypools/predicates.go
index 6a681ae366d..386a7986d42 100644
--- a/resource-manager/netapp/2021-10-01/capacitypools/predicates.go
+++ b/resource-manager/netapp/2021-10-01/capacitypools/predicates.go
@@ -13,11 +13,11 @@ type CapacityPoolOperationPredicate struct {
 
 func (p CapacityPoolOperationPredicate) Matches(input CapacityPool) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p CapacityPoolOperationPredicate) Matches(input CapacityPool) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/netapp/2021-10-01/netappaccounts/predicates.go b/resource-manager/netapp/2021-10-01/netappaccounts/predicates.go
index 2f88b783a20..ad2c0a55483 100644
--- a/resource-manager/netapp/2021-10-01/netappaccounts/predicates.go
+++ b/resource-manager/netapp/2021-10-01/netappaccounts/predicates.go
@@ -13,11 +13,11 @@ type NetAppAccountOperationPredicate struct {
 
 func (p NetAppAccountOperationPredicate) Matches(input NetAppAccount) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p NetAppAccountOperationPredicate) Matches(input NetAppAccount) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/netapp/2021-10-01/subvolumes/predicates.go b/resource-manager/netapp/2021-10-01/subvolumes/predicates.go
index cac2e5bf37b..af649a6bd08 100644
--- a/resource-manager/netapp/2021-10-01/subvolumes/predicates.go
+++ b/resource-manager/netapp/2021-10-01/subvolumes/predicates.go
@@ -11,15 +11,15 @@ type SubvolumeInfoOperationPredicate struct {
 
 func (p SubvolumeInfoOperationPredicate) Matches(input SubvolumeInfo) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/netapp/2021-10-01/volumes/predicates.go b/resource-manager/netapp/2021-10-01/volumes/predicates.go
index a24f6c01442..fcc54ae5e26 100644
--- a/resource-manager/netapp/2021-10-01/volumes/predicates.go
+++ b/resource-manager/netapp/2021-10-01/volumes/predicates.go
@@ -13,11 +13,11 @@ type VolumeOperationPredicate struct {
 
 func (p VolumeOperationPredicate) Matches(input Volume) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p VolumeOperationPredicate) Matches(input Volume) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/netapp/2022-01-01/capacitypools/predicates.go b/resource-manager/netapp/2022-01-01/capacitypools/predicates.go
index 6a681ae366d..386a7986d42 100644
--- a/resource-manager/netapp/2022-01-01/capacitypools/predicates.go
+++ b/resource-manager/netapp/2022-01-01/capacitypools/predicates.go
@@ -13,11 +13,11 @@ type CapacityPoolOperationPredicate struct {
 
 func (p CapacityPoolOperationPredicate) Matches(input CapacityPool) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p CapacityPoolOperationPredicate) Matches(input CapacityPool) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/netapp/2022-01-01/netappaccounts/predicates.go b/resource-manager/netapp/2022-01-01/netappaccounts/predicates.go
index 2f88b783a20..ad2c0a55483 100644
--- a/resource-manager/netapp/2022-01-01/netappaccounts/predicates.go
+++ b/resource-manager/netapp/2022-01-01/netappaccounts/predicates.go
@@ -13,11 +13,11 @@ type NetAppAccountOperationPredicate struct {
 
 func (p NetAppAccountOperationPredicate) Matches(input NetAppAccount) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p NetAppAccountOperationPredicate) Matches(input NetAppAccount) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/netapp/2022-01-01/subvolumes/predicates.go b/resource-manager/netapp/2022-01-01/subvolumes/predicates.go
index cac2e5bf37b..af649a6bd08 100644
--- a/resource-manager/netapp/2022-01-01/subvolumes/predicates.go
+++ b/resource-manager/netapp/2022-01-01/subvolumes/predicates.go
@@ -11,15 +11,15 @@ type SubvolumeInfoOperationPredicate struct {
 
 func (p SubvolumeInfoOperationPredicate) Matches(input SubvolumeInfo) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/netapp/2022-01-01/volumes/predicates.go b/resource-manager/netapp/2022-01-01/volumes/predicates.go
index a24f6c01442..fcc54ae5e26 100644
--- a/resource-manager/netapp/2022-01-01/volumes/predicates.go
+++ b/resource-manager/netapp/2022-01-01/volumes/predicates.go
@@ -13,11 +13,11 @@ type VolumeOperationPredicate struct {
 
 func (p VolumeOperationPredicate) Matches(input Volume) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p VolumeOperationPredicate) Matches(input Volume) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/netapp/2022-05-01/capacitypools/predicates.go b/resource-manager/netapp/2022-05-01/capacitypools/predicates.go
index 6a681ae366d..386a7986d42 100644
--- a/resource-manager/netapp/2022-05-01/capacitypools/predicates.go
+++ b/resource-manager/netapp/2022-05-01/capacitypools/predicates.go
@@ -13,11 +13,11 @@ type CapacityPoolOperationPredicate struct {
 
 func (p CapacityPoolOperationPredicate) Matches(input CapacityPool) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p CapacityPoolOperationPredicate) Matches(input CapacityPool) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/netapp/2022-05-01/netappaccounts/predicates.go b/resource-manager/netapp/2022-05-01/netappaccounts/predicates.go
index 2f88b783a20..ad2c0a55483 100644
--- a/resource-manager/netapp/2022-05-01/netappaccounts/predicates.go
+++ b/resource-manager/netapp/2022-05-01/netappaccounts/predicates.go
@@ -13,11 +13,11 @@ type NetAppAccountOperationPredicate struct {
 
 func (p NetAppAccountOperationPredicate) Matches(input NetAppAccount) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p NetAppAccountOperationPredicate) Matches(input NetAppAccount) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/netapp/2022-05-01/subvolumes/predicates.go b/resource-manager/netapp/2022-05-01/subvolumes/predicates.go
index cac2e5bf37b..af649a6bd08 100644
--- a/resource-manager/netapp/2022-05-01/subvolumes/predicates.go
+++ b/resource-manager/netapp/2022-05-01/subvolumes/predicates.go
@@ -11,15 +11,15 @@ type SubvolumeInfoOperationPredicate struct {
 
 func (p SubvolumeInfoOperationPredicate) Matches(input SubvolumeInfo) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/netapp/2022-05-01/volumes/predicates.go b/resource-manager/netapp/2022-05-01/volumes/predicates.go
index a24f6c01442..fcc54ae5e26 100644
--- a/resource-manager/netapp/2022-05-01/volumes/predicates.go
+++ b/resource-manager/netapp/2022-05-01/volumes/predicates.go
@@ -13,11 +13,11 @@ type VolumeOperationPredicate struct {
 
 func (p VolumeOperationPredicate) Matches(input Volume) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p VolumeOperationPredicate) Matches(input Volume) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/netapp/2022-09-01/capacitypools/predicates.go b/resource-manager/netapp/2022-09-01/capacitypools/predicates.go
index 6a681ae366d..386a7986d42 100644
--- a/resource-manager/netapp/2022-09-01/capacitypools/predicates.go
+++ b/resource-manager/netapp/2022-09-01/capacitypools/predicates.go
@@ -13,11 +13,11 @@ type CapacityPoolOperationPredicate struct {
 
 func (p CapacityPoolOperationPredicate) Matches(input CapacityPool) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p CapacityPoolOperationPredicate) Matches(input CapacityPool) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/netapp/2022-09-01/netappaccounts/predicates.go b/resource-manager/netapp/2022-09-01/netappaccounts/predicates.go
index 2f88b783a20..ad2c0a55483 100644
--- a/resource-manager/netapp/2022-09-01/netappaccounts/predicates.go
+++ b/resource-manager/netapp/2022-09-01/netappaccounts/predicates.go
@@ -13,11 +13,11 @@ type NetAppAccountOperationPredicate struct {
 
 func (p NetAppAccountOperationPredicate) Matches(input NetAppAccount) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p NetAppAccountOperationPredicate) Matches(input NetAppAccount) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/netapp/2022-09-01/subvolumes/predicates.go b/resource-manager/netapp/2022-09-01/subvolumes/predicates.go
index cac2e5bf37b..af649a6bd08 100644
--- a/resource-manager/netapp/2022-09-01/subvolumes/predicates.go
+++ b/resource-manager/netapp/2022-09-01/subvolumes/predicates.go
@@ -11,15 +11,15 @@ type SubvolumeInfoOperationPredicate struct {
 
 func (p SubvolumeInfoOperationPredicate) Matches(input SubvolumeInfo) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/netapp/2022-09-01/volumes/predicates.go b/resource-manager/netapp/2022-09-01/volumes/predicates.go
index a24f6c01442..fcc54ae5e26 100644
--- a/resource-manager/netapp/2022-09-01/volumes/predicates.go
+++ b/resource-manager/netapp/2022-09-01/volumes/predicates.go
@@ -13,11 +13,11 @@ type VolumeOperationPredicate struct {
 
 func (p VolumeOperationPredicate) Matches(input Volume) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p VolumeOperationPredicate) Matches(input Volume) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/netapp/2022-11-01/capacitypools/predicates.go b/resource-manager/netapp/2022-11-01/capacitypools/predicates.go
index 6a681ae366d..386a7986d42 100644
--- a/resource-manager/netapp/2022-11-01/capacitypools/predicates.go
+++ b/resource-manager/netapp/2022-11-01/capacitypools/predicates.go
@@ -13,11 +13,11 @@ type CapacityPoolOperationPredicate struct {
 
 func (p CapacityPoolOperationPredicate) Matches(input CapacityPool) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p CapacityPoolOperationPredicate) Matches(input CapacityPool) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/netapp/2022-11-01/netappaccounts/predicates.go b/resource-manager/netapp/2022-11-01/netappaccounts/predicates.go
index 2f88b783a20..ad2c0a55483 100644
--- a/resource-manager/netapp/2022-11-01/netappaccounts/predicates.go
+++ b/resource-manager/netapp/2022-11-01/netappaccounts/predicates.go
@@ -13,11 +13,11 @@ type NetAppAccountOperationPredicate struct {
 
 func (p NetAppAccountOperationPredicate) Matches(input NetAppAccount) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p NetAppAccountOperationPredicate) Matches(input NetAppAccount) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/netapp/2022-11-01/subvolumes/predicates.go b/resource-manager/netapp/2022-11-01/subvolumes/predicates.go
index cac2e5bf37b..af649a6bd08 100644
--- a/resource-manager/netapp/2022-11-01/subvolumes/predicates.go
+++ b/resource-manager/netapp/2022-11-01/subvolumes/predicates.go
@@ -11,15 +11,15 @@ type SubvolumeInfoOperationPredicate struct {
 
 func (p SubvolumeInfoOperationPredicate) Matches(input SubvolumeInfo) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/netapp/2022-11-01/volumes/predicates.go b/resource-manager/netapp/2022-11-01/volumes/predicates.go
index a24f6c01442..fcc54ae5e26 100644
--- a/resource-manager/netapp/2022-11-01/volumes/predicates.go
+++ b/resource-manager/netapp/2022-11-01/volumes/predicates.go
@@ -13,11 +13,11 @@ type VolumeOperationPredicate struct {
 
 func (p VolumeOperationPredicate) Matches(input Volume) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p VolumeOperationPredicate) Matches(input Volume) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/adminrulecollections/predicates.go b/resource-manager/network/2022-09-01/adminrulecollections/predicates.go
index 2f10067f017..67b37b95643 100644
--- a/resource-manager/network/2022-09-01/adminrulecollections/predicates.go
+++ b/resource-manager/network/2022-09-01/adminrulecollections/predicates.go
@@ -12,19 +12,19 @@ type AdminRuleCollectionOperationPredicate struct {
 
 func (p AdminRuleCollectionOperationPredicate) Matches(input AdminRuleCollection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/applicationgatewayprivateendpointconnections/predicates.go b/resource-manager/network/2022-09-01/applicationgatewayprivateendpointconnections/predicates.go
index ce7e107fd0d..46757c5239b 100644
--- a/resource-manager/network/2022-09-01/applicationgatewayprivateendpointconnections/predicates.go
+++ b/resource-manager/network/2022-09-01/applicationgatewayprivateendpointconnections/predicates.go
@@ -12,19 +12,19 @@ type ApplicationGatewayPrivateEndpointConnectionOperationPredicate struct {
 
 func (p ApplicationGatewayPrivateEndpointConnectionOperationPredicate) Matches(input ApplicationGatewayPrivateEndpointConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/applicationgatewayprivatelinkresources/predicates.go b/resource-manager/network/2022-09-01/applicationgatewayprivatelinkresources/predicates.go
index 717ca511a70..e93c21bb751 100644
--- a/resource-manager/network/2022-09-01/applicationgatewayprivatelinkresources/predicates.go
+++ b/resource-manager/network/2022-09-01/applicationgatewayprivatelinkresources/predicates.go
@@ -12,19 +12,19 @@ type ApplicationGatewayPrivateLinkResourceOperationPredicate struct {
 
 func (p ApplicationGatewayPrivateLinkResourceOperationPredicate) Matches(input ApplicationGatewayPrivateLinkResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/applicationgateways/predicates.go b/resource-manager/network/2022-09-01/applicationgateways/predicates.go
index ff35d27f30c..c51e6f7b000 100644
--- a/resource-manager/network/2022-09-01/applicationgateways/predicates.go
+++ b/resource-manager/network/2022-09-01/applicationgateways/predicates.go
@@ -13,23 +13,23 @@ type ApplicationGatewayOperationPredicate struct {
 
 func (p ApplicationGatewayOperationPredicate) Matches(input ApplicationGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -43,11 +43,11 @@ type ApplicationGatewaySslPredefinedPolicyOperationPredicate struct {
 
 func (p ApplicationGatewaySslPredefinedPolicyOperationPredicate) Matches(input ApplicationGatewaySslPredefinedPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/applicationgatewaywafdynamicmanifests/predicates.go b/resource-manager/network/2022-09-01/applicationgatewaywafdynamicmanifests/predicates.go
index 71fb8558fc1..9714d21637e 100644
--- a/resource-manager/network/2022-09-01/applicationgatewaywafdynamicmanifests/predicates.go
+++ b/resource-manager/network/2022-09-01/applicationgatewaywafdynamicmanifests/predicates.go
@@ -11,15 +11,15 @@ type ApplicationGatewayWafDynamicManifestResultOperationPredicate struct {
 
 func (p ApplicationGatewayWafDynamicManifestResultOperationPredicate) Matches(input ApplicationGatewayWafDynamicManifestResult) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/applicationsecuritygroups/predicates.go b/resource-manager/network/2022-09-01/applicationsecuritygroups/predicates.go
index bb7f348a2a4..6ea534ecd89 100644
--- a/resource-manager/network/2022-09-01/applicationsecuritygroups/predicates.go
+++ b/resource-manager/network/2022-09-01/applicationsecuritygroups/predicates.go
@@ -13,23 +13,23 @@ type ApplicationSecurityGroupOperationPredicate struct {
 
 func (p ApplicationSecurityGroupOperationPredicate) Matches(input ApplicationSecurityGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/availabledelegations/predicates.go b/resource-manager/network/2022-09-01/availabledelegations/predicates.go
index ed867e9cb60..caf6b904077 100644
--- a/resource-manager/network/2022-09-01/availabledelegations/predicates.go
+++ b/resource-manager/network/2022-09-01/availabledelegations/predicates.go
@@ -12,19 +12,19 @@ type AvailableDelegationOperationPredicate struct {
 
 func (p AvailableDelegationOperationPredicate) Matches(input AvailableDelegation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ServiceName != nil && (input.ServiceName == nil && *p.ServiceName != *input.ServiceName) {
+	if p.ServiceName != nil && (input.ServiceName == nil || *p.ServiceName != *input.ServiceName) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/availableservicealiases/predicates.go b/resource-manager/network/2022-09-01/availableservicealiases/predicates.go
index 9949a5723d5..afe2abff9ab 100644
--- a/resource-manager/network/2022-09-01/availableservicealiases/predicates.go
+++ b/resource-manager/network/2022-09-01/availableservicealiases/predicates.go
@@ -12,19 +12,19 @@ type AvailableServiceAliasOperationPredicate struct {
 
 func (p AvailableServiceAliasOperationPredicate) Matches(input AvailableServiceAlias) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceName != nil && (input.ResourceName == nil && *p.ResourceName != *input.ResourceName) {
+	if p.ResourceName != nil && (input.ResourceName == nil || *p.ResourceName != *input.ResourceName) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/azurefirewalls/predicates.go b/resource-manager/network/2022-09-01/azurefirewalls/predicates.go
index eef0c0724f3..68ca8da5623 100644
--- a/resource-manager/network/2022-09-01/azurefirewalls/predicates.go
+++ b/resource-manager/network/2022-09-01/azurefirewalls/predicates.go
@@ -13,23 +13,23 @@ type AzureFirewallOperationPredicate struct {
 
 func (p AzureFirewallOperationPredicate) Matches(input AzureFirewall) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/bastionhosts/predicates.go b/resource-manager/network/2022-09-01/bastionhosts/predicates.go
index a5e3edd0204..3c3835a32d0 100644
--- a/resource-manager/network/2022-09-01/bastionhosts/predicates.go
+++ b/resource-manager/network/2022-09-01/bastionhosts/predicates.go
@@ -18,43 +18,43 @@ type BastionActiveSessionOperationPredicate struct {
 
 func (p BastionActiveSessionOperationPredicate) Matches(input BastionActiveSession) bool {
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
-	if p.SessionDurationInMins != nil && (input.SessionDurationInMins == nil && *p.SessionDurationInMins != *input.SessionDurationInMins) {
+	if p.SessionDurationInMins != nil && (input.SessionDurationInMins == nil || *p.SessionDurationInMins != *input.SessionDurationInMins) {
 		return false
 	}
 
-	if p.SessionId != nil && (input.SessionId == nil && *p.SessionId != *input.SessionId) {
+	if p.SessionId != nil && (input.SessionId == nil || *p.SessionId != *input.SessionId) {
 		return false
 	}
 
-	if p.StartTime != nil && (input.StartTime == nil && *p.StartTime != *input.StartTime) {
+	if p.StartTime != nil && (input.StartTime == nil || *p.StartTime != *input.StartTime) {
 		return false
 	}
 
-	if p.TargetHostName != nil && (input.TargetHostName == nil && *p.TargetHostName != *input.TargetHostName) {
+	if p.TargetHostName != nil && (input.TargetHostName == nil || *p.TargetHostName != *input.TargetHostName) {
 		return false
 	}
 
-	if p.TargetIPAddress != nil && (input.TargetIPAddress == nil && *p.TargetIPAddress != *input.TargetIPAddress) {
+	if p.TargetIPAddress != nil && (input.TargetIPAddress == nil || *p.TargetIPAddress != *input.TargetIPAddress) {
 		return false
 	}
 
-	if p.TargetResourceGroup != nil && (input.TargetResourceGroup == nil && *p.TargetResourceGroup != *input.TargetResourceGroup) {
+	if p.TargetResourceGroup != nil && (input.TargetResourceGroup == nil || *p.TargetResourceGroup != *input.TargetResourceGroup) {
 		return false
 	}
 
-	if p.TargetResourceId != nil && (input.TargetResourceId == nil && *p.TargetResourceId != *input.TargetResourceId) {
+	if p.TargetResourceId != nil && (input.TargetResourceId == nil || *p.TargetResourceId != *input.TargetResourceId) {
 		return false
 	}
 
-	if p.TargetSubscriptionId != nil && (input.TargetSubscriptionId == nil && *p.TargetSubscriptionId != *input.TargetSubscriptionId) {
+	if p.TargetSubscriptionId != nil && (input.TargetSubscriptionId == nil || *p.TargetSubscriptionId != *input.TargetSubscriptionId) {
 		return false
 	}
 
-	if p.UserName != nil && (input.UserName == nil && *p.UserName != *input.UserName) {
+	if p.UserName != nil && (input.UserName == nil || *p.UserName != *input.UserName) {
 		return false
 	}
 
@@ -71,23 +71,23 @@ type BastionHostOperationPredicate struct {
 
 func (p BastionHostOperationPredicate) Matches(input BastionHost) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -102,15 +102,15 @@ type BastionSessionStateOperationPredicate struct {
 
 func (p BastionSessionStateOperationPredicate) Matches(input BastionSessionState) bool {
 
-	if p.Message != nil && (input.Message == nil && *p.Message != *input.Message) {
+	if p.Message != nil && (input.Message == nil || *p.Message != *input.Message) {
 		return false
 	}
 
-	if p.SessionId != nil && (input.SessionId == nil && *p.SessionId != *input.SessionId) {
+	if p.SessionId != nil && (input.SessionId == nil || *p.SessionId != *input.SessionId) {
 		return false
 	}
 
-	if p.State != nil && (input.State == nil && *p.State != *input.State) {
+	if p.State != nil && (input.State == nil || *p.State != *input.State) {
 		return false
 	}
 
@@ -125,15 +125,15 @@ type BastionShareableLinkOperationPredicate struct {
 
 func (p BastionShareableLinkOperationPredicate) Matches(input BastionShareableLink) bool {
 
-	if p.Bsl != nil && (input.Bsl == nil && *p.Bsl != *input.Bsl) {
+	if p.Bsl != nil && (input.Bsl == nil || *p.Bsl != *input.Bsl) {
 		return false
 	}
 
-	if p.CreatedAt != nil && (input.CreatedAt == nil && *p.CreatedAt != *input.CreatedAt) {
+	if p.CreatedAt != nil && (input.CreatedAt == nil || *p.CreatedAt != *input.CreatedAt) {
 		return false
 	}
 
-	if p.Message != nil && (input.Message == nil && *p.Message != *input.Message) {
+	if p.Message != nil && (input.Message == nil || *p.Message != *input.Message) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/bastionshareablelink/predicates.go b/resource-manager/network/2022-09-01/bastionshareablelink/predicates.go
index ce72bc40681..15f07095262 100644
--- a/resource-manager/network/2022-09-01/bastionshareablelink/predicates.go
+++ b/resource-manager/network/2022-09-01/bastionshareablelink/predicates.go
@@ -11,15 +11,15 @@ type BastionShareableLinkOperationPredicate struct {
 
 func (p BastionShareableLinkOperationPredicate) Matches(input BastionShareableLink) bool {
 
-	if p.Bsl != nil && (input.Bsl == nil && *p.Bsl != *input.Bsl) {
+	if p.Bsl != nil && (input.Bsl == nil || *p.Bsl != *input.Bsl) {
 		return false
 	}
 
-	if p.CreatedAt != nil && (input.CreatedAt == nil && *p.CreatedAt != *input.CreatedAt) {
+	if p.CreatedAt != nil && (input.CreatedAt == nil || *p.CreatedAt != *input.CreatedAt) {
 		return false
 	}
 
-	if p.Message != nil && (input.Message == nil && *p.Message != *input.Message) {
+	if p.Message != nil && (input.Message == nil || *p.Message != *input.Message) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/bgpservicecommunities/predicates.go b/resource-manager/network/2022-09-01/bgpservicecommunities/predicates.go
index ae5019b967b..2e90f55ae55 100644
--- a/resource-manager/network/2022-09-01/bgpservicecommunities/predicates.go
+++ b/resource-manager/network/2022-09-01/bgpservicecommunities/predicates.go
@@ -12,19 +12,19 @@ type BgpServiceCommunityOperationPredicate struct {
 
 func (p BgpServiceCommunityOperationPredicate) Matches(input BgpServiceCommunity) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/cloudservicepublicipaddresses/predicates.go b/resource-manager/network/2022-09-01/cloudservicepublicipaddresses/predicates.go
index 0c1aab1e694..f27f03144ee 100644
--- a/resource-manager/network/2022-09-01/cloudservicepublicipaddresses/predicates.go
+++ b/resource-manager/network/2022-09-01/cloudservicepublicipaddresses/predicates.go
@@ -13,23 +13,23 @@ type PublicIPAddressOperationPredicate struct {
 
 func (p PublicIPAddressOperationPredicate) Matches(input PublicIPAddress) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/connectivityconfigurations/predicates.go b/resource-manager/network/2022-09-01/connectivityconfigurations/predicates.go
index a581c573c65..ecab73247f2 100644
--- a/resource-manager/network/2022-09-01/connectivityconfigurations/predicates.go
+++ b/resource-manager/network/2022-09-01/connectivityconfigurations/predicates.go
@@ -12,19 +12,19 @@ type ConnectivityConfigurationOperationPredicate struct {
 
 func (p ConnectivityConfigurationOperationPredicate) Matches(input ConnectivityConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/customipprefixes/predicates.go b/resource-manager/network/2022-09-01/customipprefixes/predicates.go
index a7d5ffe920a..288f9cfa042 100644
--- a/resource-manager/network/2022-09-01/customipprefixes/predicates.go
+++ b/resource-manager/network/2022-09-01/customipprefixes/predicates.go
@@ -13,23 +13,23 @@ type CustomIPPrefixOperationPredicate struct {
 
 func (p CustomIPPrefixOperationPredicate) Matches(input CustomIPPrefix) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/ddosprotectionplans/predicates.go b/resource-manager/network/2022-09-01/ddosprotectionplans/predicates.go
index f0bd539d370..6ad9bbf5374 100644
--- a/resource-manager/network/2022-09-01/ddosprotectionplans/predicates.go
+++ b/resource-manager/network/2022-09-01/ddosprotectionplans/predicates.go
@@ -13,23 +13,23 @@ type DdosProtectionPlanOperationPredicate struct {
 
 func (p DdosProtectionPlanOperationPredicate) Matches(input DdosProtectionPlan) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/dscpconfigurations/predicates.go b/resource-manager/network/2022-09-01/dscpconfigurations/predicates.go
index 2281e144720..7628df6beb6 100644
--- a/resource-manager/network/2022-09-01/dscpconfigurations/predicates.go
+++ b/resource-manager/network/2022-09-01/dscpconfigurations/predicates.go
@@ -13,23 +13,23 @@ type DscpConfigurationOperationPredicate struct {
 
 func (p DscpConfigurationOperationPredicate) Matches(input DscpConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/endpointservices/predicates.go b/resource-manager/network/2022-09-01/endpointservices/predicates.go
index 1e48205c952..9a5ec06a288 100644
--- a/resource-manager/network/2022-09-01/endpointservices/predicates.go
+++ b/resource-manager/network/2022-09-01/endpointservices/predicates.go
@@ -11,15 +11,15 @@ type EndpointServiceResultOperationPredicate struct {
 
 func (p EndpointServiceResultOperationPredicate) Matches(input EndpointServiceResult) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/expressroutecircuitauthorizations/predicates.go b/resource-manager/network/2022-09-01/expressroutecircuitauthorizations/predicates.go
index 4a3d75102ac..3533e80a13e 100644
--- a/resource-manager/network/2022-09-01/expressroutecircuitauthorizations/predicates.go
+++ b/resource-manager/network/2022-09-01/expressroutecircuitauthorizations/predicates.go
@@ -12,19 +12,19 @@ type ExpressRouteCircuitAuthorizationOperationPredicate struct {
 
 func (p ExpressRouteCircuitAuthorizationOperationPredicate) Matches(input ExpressRouteCircuitAuthorization) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/expressroutecircuitconnections/predicates.go b/resource-manager/network/2022-09-01/expressroutecircuitconnections/predicates.go
index 697aab56df9..6c65b4df05d 100644
--- a/resource-manager/network/2022-09-01/expressroutecircuitconnections/predicates.go
+++ b/resource-manager/network/2022-09-01/expressroutecircuitconnections/predicates.go
@@ -12,19 +12,19 @@ type ExpressRouteCircuitConnectionOperationPredicate struct {
 
 func (p ExpressRouteCircuitConnectionOperationPredicate) Matches(input ExpressRouteCircuitConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/expressroutecircuitpeerings/predicates.go b/resource-manager/network/2022-09-01/expressroutecircuitpeerings/predicates.go
index 8b3551606e8..1e725c4e63a 100644
--- a/resource-manager/network/2022-09-01/expressroutecircuitpeerings/predicates.go
+++ b/resource-manager/network/2022-09-01/expressroutecircuitpeerings/predicates.go
@@ -12,19 +12,19 @@ type ExpressRouteCircuitPeeringOperationPredicate struct {
 
 func (p ExpressRouteCircuitPeeringOperationPredicate) Matches(input ExpressRouteCircuitPeering) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/expressroutecircuits/predicates.go b/resource-manager/network/2022-09-01/expressroutecircuits/predicates.go
index c0013d9656e..3fdbc040dbf 100644
--- a/resource-manager/network/2022-09-01/expressroutecircuits/predicates.go
+++ b/resource-manager/network/2022-09-01/expressroutecircuits/predicates.go
@@ -13,23 +13,23 @@ type ExpressRouteCircuitOperationPredicate struct {
 
 func (p ExpressRouteCircuitOperationPredicate) Matches(input ExpressRouteCircuit) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/expressroutecrossconnectionpeerings/predicates.go b/resource-manager/network/2022-09-01/expressroutecrossconnectionpeerings/predicates.go
index a21509eb010..abec5984ec1 100644
--- a/resource-manager/network/2022-09-01/expressroutecrossconnectionpeerings/predicates.go
+++ b/resource-manager/network/2022-09-01/expressroutecrossconnectionpeerings/predicates.go
@@ -11,15 +11,15 @@ type ExpressRouteCrossConnectionPeeringOperationPredicate struct {
 
 func (p ExpressRouteCrossConnectionPeeringOperationPredicate) Matches(input ExpressRouteCrossConnectionPeering) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/expressroutecrossconnections/predicates.go b/resource-manager/network/2022-09-01/expressroutecrossconnections/predicates.go
index 2b30277eb5d..f3d9b3a8dff 100644
--- a/resource-manager/network/2022-09-01/expressroutecrossconnections/predicates.go
+++ b/resource-manager/network/2022-09-01/expressroutecrossconnections/predicates.go
@@ -13,23 +13,23 @@ type ExpressRouteCrossConnectionOperationPredicate struct {
 
 func (p ExpressRouteCrossConnectionOperationPredicate) Matches(input ExpressRouteCrossConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/expressroutelinks/predicates.go b/resource-manager/network/2022-09-01/expressroutelinks/predicates.go
index c5955ad29e5..bd6127afc55 100644
--- a/resource-manager/network/2022-09-01/expressroutelinks/predicates.go
+++ b/resource-manager/network/2022-09-01/expressroutelinks/predicates.go
@@ -11,15 +11,15 @@ type ExpressRouteLinkOperationPredicate struct {
 
 func (p ExpressRouteLinkOperationPredicate) Matches(input ExpressRouteLink) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/expressrouteportauthorizations/predicates.go b/resource-manager/network/2022-09-01/expressrouteportauthorizations/predicates.go
index 2cdc970dad0..d12fc29e52a 100644
--- a/resource-manager/network/2022-09-01/expressrouteportauthorizations/predicates.go
+++ b/resource-manager/network/2022-09-01/expressrouteportauthorizations/predicates.go
@@ -12,19 +12,19 @@ type ExpressRoutePortAuthorizationOperationPredicate struct {
 
 func (p ExpressRoutePortAuthorizationOperationPredicate) Matches(input ExpressRoutePortAuthorization) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/expressrouteports/predicates.go b/resource-manager/network/2022-09-01/expressrouteports/predicates.go
index 26d4591a65f..7339fac991b 100644
--- a/resource-manager/network/2022-09-01/expressrouteports/predicates.go
+++ b/resource-manager/network/2022-09-01/expressrouteports/predicates.go
@@ -13,23 +13,23 @@ type ExpressRoutePortOperationPredicate struct {
 
 func (p ExpressRoutePortOperationPredicate) Matches(input ExpressRoutePort) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/expressrouteportslocations/predicates.go b/resource-manager/network/2022-09-01/expressrouteportslocations/predicates.go
index 43649ada37d..3b345c2e1f5 100644
--- a/resource-manager/network/2022-09-01/expressrouteportslocations/predicates.go
+++ b/resource-manager/network/2022-09-01/expressrouteportslocations/predicates.go
@@ -12,19 +12,19 @@ type ExpressRoutePortsLocationOperationPredicate struct {
 
 func (p ExpressRoutePortsLocationOperationPredicate) Matches(input ExpressRoutePortsLocation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/expressrouteserviceproviders/predicates.go b/resource-manager/network/2022-09-01/expressrouteserviceproviders/predicates.go
index baa5b8aba7a..d2c605983d7 100644
--- a/resource-manager/network/2022-09-01/expressrouteserviceproviders/predicates.go
+++ b/resource-manager/network/2022-09-01/expressrouteserviceproviders/predicates.go
@@ -12,19 +12,19 @@ type ExpressRouteServiceProviderOperationPredicate struct {
 
 func (p ExpressRouteServiceProviderOperationPredicate) Matches(input ExpressRouteServiceProvider) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/firewallpolicies/predicates.go b/resource-manager/network/2022-09-01/firewallpolicies/predicates.go
index b95e12c63e2..2640042ba7a 100644
--- a/resource-manager/network/2022-09-01/firewallpolicies/predicates.go
+++ b/resource-manager/network/2022-09-01/firewallpolicies/predicates.go
@@ -13,23 +13,23 @@ type FirewallPolicyOperationPredicate struct {
 
 func (p FirewallPolicyOperationPredicate) Matches(input FirewallPolicy) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/firewallpolicyrulecollectiongroups/predicates.go b/resource-manager/network/2022-09-01/firewallpolicyrulecollectiongroups/predicates.go
index c190891d1a1..9762acada56 100644
--- a/resource-manager/network/2022-09-01/firewallpolicyrulecollectiongroups/predicates.go
+++ b/resource-manager/network/2022-09-01/firewallpolicyrulecollectiongroups/predicates.go
@@ -12,19 +12,19 @@ type FirewallPolicyRuleCollectionGroupOperationPredicate struct {
 
 func (p FirewallPolicyRuleCollectionGroupOperationPredicate) Matches(input FirewallPolicyRuleCollectionGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/flowlogs/predicates.go b/resource-manager/network/2022-09-01/flowlogs/predicates.go
index 1aa47092e55..746df2611cc 100644
--- a/resource-manager/network/2022-09-01/flowlogs/predicates.go
+++ b/resource-manager/network/2022-09-01/flowlogs/predicates.go
@@ -13,23 +13,23 @@ type FlowLogOperationPredicate struct {
 
 func (p FlowLogOperationPredicate) Matches(input FlowLog) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/ipallocations/predicates.go b/resource-manager/network/2022-09-01/ipallocations/predicates.go
index 866a19a7190..5f4e136ae66 100644
--- a/resource-manager/network/2022-09-01/ipallocations/predicates.go
+++ b/resource-manager/network/2022-09-01/ipallocations/predicates.go
@@ -13,23 +13,23 @@ type IPAllocationOperationPredicate struct {
 
 func (p IPAllocationOperationPredicate) Matches(input IPAllocation) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/ipgroups/predicates.go b/resource-manager/network/2022-09-01/ipgroups/predicates.go
index 705b10e2ed0..a64e98c2290 100644
--- a/resource-manager/network/2022-09-01/ipgroups/predicates.go
+++ b/resource-manager/network/2022-09-01/ipgroups/predicates.go
@@ -13,23 +13,23 @@ type IPGroupOperationPredicate struct {
 
 func (p IPGroupOperationPredicate) Matches(input IPGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/loadbalancers/predicates.go b/resource-manager/network/2022-09-01/loadbalancers/predicates.go
index b5cc68245b6..82f247704c6 100644
--- a/resource-manager/network/2022-09-01/loadbalancers/predicates.go
+++ b/resource-manager/network/2022-09-01/loadbalancers/predicates.go
@@ -12,19 +12,19 @@ type BackendAddressPoolOperationPredicate struct {
 
 func (p BackendAddressPoolOperationPredicate) Matches(input BackendAddressPool) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,19 +40,19 @@ type FrontendIPConfigurationOperationPredicate struct {
 
 func (p FrontendIPConfigurationOperationPredicate) Matches(input FrontendIPConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -68,19 +68,19 @@ type InboundNatRuleOperationPredicate struct {
 
 func (p InboundNatRuleOperationPredicate) Matches(input InboundNatRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -97,23 +97,23 @@ type LoadBalancerOperationPredicate struct {
 
 func (p LoadBalancerOperationPredicate) Matches(input LoadBalancer) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -129,19 +129,19 @@ type LoadBalancingRuleOperationPredicate struct {
 
 func (p LoadBalancingRuleOperationPredicate) Matches(input LoadBalancingRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -158,23 +158,23 @@ type NetworkInterfaceOperationPredicate struct {
 
 func (p NetworkInterfaceOperationPredicate) Matches(input NetworkInterface) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -190,19 +190,19 @@ type OutboundRuleOperationPredicate struct {
 
 func (p OutboundRuleOperationPredicate) Matches(input OutboundRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -218,19 +218,19 @@ type ProbeOperationPredicate struct {
 
 func (p ProbeOperationPredicate) Matches(input Probe) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/localnetworkgateways/predicates.go b/resource-manager/network/2022-09-01/localnetworkgateways/predicates.go
index 462c9037886..d4e529f8a9c 100644
--- a/resource-manager/network/2022-09-01/localnetworkgateways/predicates.go
+++ b/resource-manager/network/2022-09-01/localnetworkgateways/predicates.go
@@ -13,23 +13,23 @@ type LocalNetworkGatewayOperationPredicate struct {
 
 func (p LocalNetworkGatewayOperationPredicate) Matches(input LocalNetworkGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/natgateways/predicates.go b/resource-manager/network/2022-09-01/natgateways/predicates.go
index d5cfb6b66fc..c0e09cf2f07 100644
--- a/resource-manager/network/2022-09-01/natgateways/predicates.go
+++ b/resource-manager/network/2022-09-01/natgateways/predicates.go
@@ -13,23 +13,23 @@ type NatGatewayOperationPredicate struct {
 
 func (p NatGatewayOperationPredicate) Matches(input NatGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/networkgroups/predicates.go b/resource-manager/network/2022-09-01/networkgroups/predicates.go
index d38c9efbbfc..621d0d7b40a 100644
--- a/resource-manager/network/2022-09-01/networkgroups/predicates.go
+++ b/resource-manager/network/2022-09-01/networkgroups/predicates.go
@@ -12,19 +12,19 @@ type NetworkGroupOperationPredicate struct {
 
 func (p NetworkGroupOperationPredicate) Matches(input NetworkGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/networkinterfaces/predicates.go b/resource-manager/network/2022-09-01/networkinterfaces/predicates.go
index 941725ff11e..1bdf1a16800 100644
--- a/resource-manager/network/2022-09-01/networkinterfaces/predicates.go
+++ b/resource-manager/network/2022-09-01/networkinterfaces/predicates.go
@@ -13,23 +13,23 @@ type LoadBalancerOperationPredicate struct {
 
 func (p LoadBalancerOperationPredicate) Matches(input LoadBalancer) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -46,23 +46,23 @@ type NetworkInterfaceOperationPredicate struct {
 
 func (p NetworkInterfaceOperationPredicate) Matches(input NetworkInterface) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -78,19 +78,19 @@ type NetworkInterfaceIPConfigurationOperationPredicate struct {
 
 func (p NetworkInterfaceIPConfigurationOperationPredicate) Matches(input NetworkInterfaceIPConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -106,19 +106,19 @@ type NetworkInterfaceTapConfigurationOperationPredicate struct {
 
 func (p NetworkInterfaceTapConfigurationOperationPredicate) Matches(input NetworkInterfaceTapConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/networkmanagerconnections/predicates.go b/resource-manager/network/2022-09-01/networkmanagerconnections/predicates.go
index a4d1d456e2e..145b7b7261a 100644
--- a/resource-manager/network/2022-09-01/networkmanagerconnections/predicates.go
+++ b/resource-manager/network/2022-09-01/networkmanagerconnections/predicates.go
@@ -12,19 +12,19 @@ type NetworkManagerConnectionOperationPredicate struct {
 
 func (p NetworkManagerConnectionOperationPredicate) Matches(input NetworkManagerConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/networkmanagers/predicates.go b/resource-manager/network/2022-09-01/networkmanagers/predicates.go
index fee18f9eea0..7c1597c2666 100644
--- a/resource-manager/network/2022-09-01/networkmanagers/predicates.go
+++ b/resource-manager/network/2022-09-01/networkmanagers/predicates.go
@@ -13,23 +13,23 @@ type NetworkManagerOperationPredicate struct {
 
 func (p NetworkManagerOperationPredicate) Matches(input NetworkManager) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/networkprofiles/predicates.go b/resource-manager/network/2022-09-01/networkprofiles/predicates.go
index c1ae5ce4c79..c8b72ff46b2 100644
--- a/resource-manager/network/2022-09-01/networkprofiles/predicates.go
+++ b/resource-manager/network/2022-09-01/networkprofiles/predicates.go
@@ -13,23 +13,23 @@ type NetworkProfileOperationPredicate struct {
 
 func (p NetworkProfileOperationPredicate) Matches(input NetworkProfile) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/networksecuritygroups/predicates.go b/resource-manager/network/2022-09-01/networksecuritygroups/predicates.go
index 156bd00cd3d..b9f6d3f3df5 100644
--- a/resource-manager/network/2022-09-01/networksecuritygroups/predicates.go
+++ b/resource-manager/network/2022-09-01/networksecuritygroups/predicates.go
@@ -13,23 +13,23 @@ type NetworkSecurityGroupOperationPredicate struct {
 
 func (p NetworkSecurityGroupOperationPredicate) Matches(input NetworkSecurityGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/networkvirtualappliances/predicates.go b/resource-manager/network/2022-09-01/networkvirtualappliances/predicates.go
index d9e9dfa93ea..676b2af6c25 100644
--- a/resource-manager/network/2022-09-01/networkvirtualappliances/predicates.go
+++ b/resource-manager/network/2022-09-01/networkvirtualappliances/predicates.go
@@ -13,23 +13,23 @@ type NetworkVirtualApplianceOperationPredicate struct {
 
 func (p NetworkVirtualApplianceOperationPredicate) Matches(input NetworkVirtualAppliance) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/peerexpressroutecircuitconnections/predicates.go b/resource-manager/network/2022-09-01/peerexpressroutecircuitconnections/predicates.go
index 967ae9d3147..c0766bb2d18 100644
--- a/resource-manager/network/2022-09-01/peerexpressroutecircuitconnections/predicates.go
+++ b/resource-manager/network/2022-09-01/peerexpressroutecircuitconnections/predicates.go
@@ -12,19 +12,19 @@ type PeerExpressRouteCircuitConnectionOperationPredicate struct {
 
 func (p PeerExpressRouteCircuitConnectionOperationPredicate) Matches(input PeerExpressRouteCircuitConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/privatednszonegroups/predicates.go b/resource-manager/network/2022-09-01/privatednszonegroups/predicates.go
index f77b300cd94..4d27803d6e2 100644
--- a/resource-manager/network/2022-09-01/privatednszonegroups/predicates.go
+++ b/resource-manager/network/2022-09-01/privatednszonegroups/predicates.go
@@ -11,15 +11,15 @@ type PrivateDnsZoneGroupOperationPredicate struct {
 
 func (p PrivateDnsZoneGroupOperationPredicate) Matches(input PrivateDnsZoneGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/privateendpoints/predicates.go b/resource-manager/network/2022-09-01/privateendpoints/predicates.go
index c2c9137a231..c99098d0163 100644
--- a/resource-manager/network/2022-09-01/privateendpoints/predicates.go
+++ b/resource-manager/network/2022-09-01/privateendpoints/predicates.go
@@ -13,23 +13,23 @@ type AvailablePrivateEndpointTypeOperationPredicate struct {
 
 func (p AvailablePrivateEndpointTypeOperationPredicate) Matches(input AvailablePrivateEndpointType) bool {
 
-	if p.DisplayName != nil && (input.DisplayName == nil && *p.DisplayName != *input.DisplayName) {
+	if p.DisplayName != nil && (input.DisplayName == nil || *p.DisplayName != *input.DisplayName) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceName != nil && (input.ResourceName == nil && *p.ResourceName != *input.ResourceName) {
+	if p.ResourceName != nil && (input.ResourceName == nil || *p.ResourceName != *input.ResourceName) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -46,23 +46,23 @@ type PrivateEndpointOperationPredicate struct {
 
 func (p PrivateEndpointOperationPredicate) Matches(input PrivateEndpoint) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/privatelinkservices/predicates.go b/resource-manager/network/2022-09-01/privatelinkservices/predicates.go
index 44963c73ff0..f7e18f9feee 100644
--- a/resource-manager/network/2022-09-01/privatelinkservices/predicates.go
+++ b/resource-manager/network/2022-09-01/privatelinkservices/predicates.go
@@ -9,7 +9,7 @@ type AutoApprovedPrivateLinkServiceOperationPredicate struct {
 
 func (p AutoApprovedPrivateLinkServiceOperationPredicate) Matches(input AutoApprovedPrivateLinkService) bool {
 
-	if p.PrivateLinkService != nil && (input.PrivateLinkService == nil && *p.PrivateLinkService != *input.PrivateLinkService) {
+	if p.PrivateLinkService != nil && (input.PrivateLinkService == nil || *p.PrivateLinkService != *input.PrivateLinkService) {
 		return false
 	}
 
@@ -25,19 +25,19 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -54,23 +54,23 @@ type PrivateLinkServiceOperationPredicate struct {
 
 func (p PrivateLinkServiceOperationPredicate) Matches(input PrivateLinkService) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/publicipaddresses/predicates.go b/resource-manager/network/2022-09-01/publicipaddresses/predicates.go
index 9d8f3f36a5b..07d29ffa733 100644
--- a/resource-manager/network/2022-09-01/publicipaddresses/predicates.go
+++ b/resource-manager/network/2022-09-01/publicipaddresses/predicates.go
@@ -13,23 +13,23 @@ type PublicIPAddressOperationPredicate struct {
 
 func (p PublicIPAddressOperationPredicate) Matches(input PublicIPAddress) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/publicipprefixes/predicates.go b/resource-manager/network/2022-09-01/publicipprefixes/predicates.go
index 26580cf1658..7deb3ca2bbf 100644
--- a/resource-manager/network/2022-09-01/publicipprefixes/predicates.go
+++ b/resource-manager/network/2022-09-01/publicipprefixes/predicates.go
@@ -13,23 +13,23 @@ type PublicIPPrefixOperationPredicate struct {
 
 func (p PublicIPPrefixOperationPredicate) Matches(input PublicIPPrefix) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/routefilterrules/predicates.go b/resource-manager/network/2022-09-01/routefilterrules/predicates.go
index 439bf5e7c60..3067b052089 100644
--- a/resource-manager/network/2022-09-01/routefilterrules/predicates.go
+++ b/resource-manager/network/2022-09-01/routefilterrules/predicates.go
@@ -12,19 +12,19 @@ type RouteFilterRuleOperationPredicate struct {
 
 func (p RouteFilterRuleOperationPredicate) Matches(input RouteFilterRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/routefilters/predicates.go b/resource-manager/network/2022-09-01/routefilters/predicates.go
index f2e9903f324..62b69547730 100644
--- a/resource-manager/network/2022-09-01/routefilters/predicates.go
+++ b/resource-manager/network/2022-09-01/routefilters/predicates.go
@@ -13,11 +13,11 @@ type RouteFilterOperationPredicate struct {
 
 func (p RouteFilterOperationPredicate) Matches(input RouteFilter) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p RouteFilterOperationPredicate) Matches(input RouteFilter) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/routes/predicates.go b/resource-manager/network/2022-09-01/routes/predicates.go
index 9db89e208d7..b0ff24a6573 100644
--- a/resource-manager/network/2022-09-01/routes/predicates.go
+++ b/resource-manager/network/2022-09-01/routes/predicates.go
@@ -12,19 +12,19 @@ type RouteOperationPredicate struct {
 
 func (p RouteOperationPredicate) Matches(input Route) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/routetables/predicates.go b/resource-manager/network/2022-09-01/routetables/predicates.go
index d609a04968c..e1d89b9fbd4 100644
--- a/resource-manager/network/2022-09-01/routetables/predicates.go
+++ b/resource-manager/network/2022-09-01/routetables/predicates.go
@@ -13,23 +13,23 @@ type RouteTableOperationPredicate struct {
 
 func (p RouteTableOperationPredicate) Matches(input RouteTable) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/scopeconnections/predicates.go b/resource-manager/network/2022-09-01/scopeconnections/predicates.go
index 0900eab97ca..eda309664f4 100644
--- a/resource-manager/network/2022-09-01/scopeconnections/predicates.go
+++ b/resource-manager/network/2022-09-01/scopeconnections/predicates.go
@@ -12,19 +12,19 @@ type ScopeConnectionOperationPredicate struct {
 
 func (p ScopeConnectionOperationPredicate) Matches(input ScopeConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/securityadminconfigurations/predicates.go b/resource-manager/network/2022-09-01/securityadminconfigurations/predicates.go
index 87b42dd3ac4..bcc5de9a6a8 100644
--- a/resource-manager/network/2022-09-01/securityadminconfigurations/predicates.go
+++ b/resource-manager/network/2022-09-01/securityadminconfigurations/predicates.go
@@ -12,19 +12,19 @@ type SecurityAdminConfigurationOperationPredicate struct {
 
 func (p SecurityAdminConfigurationOperationPredicate) Matches(input SecurityAdminConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/securitypartnerproviders/predicates.go b/resource-manager/network/2022-09-01/securitypartnerproviders/predicates.go
index de30add5a7f..ef826d6c55f 100644
--- a/resource-manager/network/2022-09-01/securitypartnerproviders/predicates.go
+++ b/resource-manager/network/2022-09-01/securitypartnerproviders/predicates.go
@@ -13,23 +13,23 @@ type SecurityPartnerProviderOperationPredicate struct {
 
 func (p SecurityPartnerProviderOperationPredicate) Matches(input SecurityPartnerProvider) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/securityrules/predicates.go b/resource-manager/network/2022-09-01/securityrules/predicates.go
index 1e328f61d2d..adf918c9ac4 100644
--- a/resource-manager/network/2022-09-01/securityrules/predicates.go
+++ b/resource-manager/network/2022-09-01/securityrules/predicates.go
@@ -12,19 +12,19 @@ type SecurityRuleOperationPredicate struct {
 
 func (p SecurityRuleOperationPredicate) Matches(input SecurityRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/serviceendpointpolicies/predicates.go b/resource-manager/network/2022-09-01/serviceendpointpolicies/predicates.go
index 9fe8475bd27..ddd972a1d9d 100644
--- a/resource-manager/network/2022-09-01/serviceendpointpolicies/predicates.go
+++ b/resource-manager/network/2022-09-01/serviceendpointpolicies/predicates.go
@@ -14,27 +14,27 @@ type ServiceEndpointPolicyOperationPredicate struct {
 
 func (p ServiceEndpointPolicyOperationPredicate) Matches(input ServiceEndpointPolicy) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/serviceendpointpolicydefinitions/predicates.go b/resource-manager/network/2022-09-01/serviceendpointpolicydefinitions/predicates.go
index b92a3589171..a7a08fa9deb 100644
--- a/resource-manager/network/2022-09-01/serviceendpointpolicydefinitions/predicates.go
+++ b/resource-manager/network/2022-09-01/serviceendpointpolicydefinitions/predicates.go
@@ -12,19 +12,19 @@ type ServiceEndpointPolicyDefinitionOperationPredicate struct {
 
 func (p ServiceEndpointPolicyDefinitionOperationPredicate) Matches(input ServiceEndpointPolicyDefinition) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/servicetags/predicates.go b/resource-manager/network/2022-09-01/servicetags/predicates.go
index 01e183fee6a..e10bffe6a4f 100644
--- a/resource-manager/network/2022-09-01/servicetags/predicates.go
+++ b/resource-manager/network/2022-09-01/servicetags/predicates.go
@@ -11,15 +11,15 @@ type ServiceTagInformationOperationPredicate struct {
 
 func (p ServiceTagInformationOperationPredicate) Matches(input ServiceTagInformation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ServiceTagChangeNumber != nil && (input.ServiceTagChangeNumber == nil && *p.ServiceTagChangeNumber != *input.ServiceTagChangeNumber) {
+	if p.ServiceTagChangeNumber != nil && (input.ServiceTagChangeNumber == nil || *p.ServiceTagChangeNumber != *input.ServiceTagChangeNumber) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/staticmembers/predicates.go b/resource-manager/network/2022-09-01/staticmembers/predicates.go
index 7b5a1906bbf..0fb08a96da7 100644
--- a/resource-manager/network/2022-09-01/staticmembers/predicates.go
+++ b/resource-manager/network/2022-09-01/staticmembers/predicates.go
@@ -12,19 +12,19 @@ type StaticMemberOperationPredicate struct {
 
 func (p StaticMemberOperationPredicate) Matches(input StaticMember) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/subnets/predicates.go b/resource-manager/network/2022-09-01/subnets/predicates.go
index 7c9a9678660..33b8979e3cc 100644
--- a/resource-manager/network/2022-09-01/subnets/predicates.go
+++ b/resource-manager/network/2022-09-01/subnets/predicates.go
@@ -12,19 +12,19 @@ type SubnetOperationPredicate struct {
 
 func (p SubnetOperationPredicate) Matches(input Subnet) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/usages/predicates.go b/resource-manager/network/2022-09-01/usages/predicates.go
index a37fa34c531..ad3b401c1ce 100644
--- a/resource-manager/network/2022-09-01/usages/predicates.go
+++ b/resource-manager/network/2022-09-01/usages/predicates.go
@@ -15,7 +15,7 @@ func (p UsageOperationPredicate) Matches(input Usage) bool {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/virtualappliancesites/predicates.go b/resource-manager/network/2022-09-01/virtualappliancesites/predicates.go
index a416f83b081..af31f940d24 100644
--- a/resource-manager/network/2022-09-01/virtualappliancesites/predicates.go
+++ b/resource-manager/network/2022-09-01/virtualappliancesites/predicates.go
@@ -12,19 +12,19 @@ type VirtualApplianceSiteOperationPredicate struct {
 
 func (p VirtualApplianceSiteOperationPredicate) Matches(input VirtualApplianceSite) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/virtualapplianceskus/predicates.go b/resource-manager/network/2022-09-01/virtualapplianceskus/predicates.go
index 651b08c3f2b..758bba40370 100644
--- a/resource-manager/network/2022-09-01/virtualapplianceskus/predicates.go
+++ b/resource-manager/network/2022-09-01/virtualapplianceskus/predicates.go
@@ -13,23 +13,23 @@ type NetworkVirtualApplianceSkuOperationPredicate struct {
 
 func (p NetworkVirtualApplianceSkuOperationPredicate) Matches(input NetworkVirtualApplianceSku) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/virtualnetworkgatewayconnections/predicates.go b/resource-manager/network/2022-09-01/virtualnetworkgatewayconnections/predicates.go
index 3b275eedb99..c1fe558dd66 100644
--- a/resource-manager/network/2022-09-01/virtualnetworkgatewayconnections/predicates.go
+++ b/resource-manager/network/2022-09-01/virtualnetworkgatewayconnections/predicates.go
@@ -13,23 +13,23 @@ type VirtualNetworkGatewayConnectionOperationPredicate struct {
 
 func (p VirtualNetworkGatewayConnectionOperationPredicate) Matches(input VirtualNetworkGatewayConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/virtualnetworkgateways/predicates.go b/resource-manager/network/2022-09-01/virtualnetworkgateways/predicates.go
index 4f5901d8f83..e03cad8f7b6 100644
--- a/resource-manager/network/2022-09-01/virtualnetworkgateways/predicates.go
+++ b/resource-manager/network/2022-09-01/virtualnetworkgateways/predicates.go
@@ -13,23 +13,23 @@ type VirtualNetworkGatewayOperationPredicate struct {
 
 func (p VirtualNetworkGatewayOperationPredicate) Matches(input VirtualNetworkGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -46,23 +46,23 @@ type VirtualNetworkGatewayConnectionListEntityOperationPredicate struct {
 
 func (p VirtualNetworkGatewayConnectionListEntityOperationPredicate) Matches(input VirtualNetworkGatewayConnectionListEntity) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -78,19 +78,19 @@ type VirtualNetworkGatewayNatRuleOperationPredicate struct {
 
 func (p VirtualNetworkGatewayNatRuleOperationPredicate) Matches(input VirtualNetworkGatewayNatRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/virtualnetworkpeerings/predicates.go b/resource-manager/network/2022-09-01/virtualnetworkpeerings/predicates.go
index 0435384a5d6..a945839e0b2 100644
--- a/resource-manager/network/2022-09-01/virtualnetworkpeerings/predicates.go
+++ b/resource-manager/network/2022-09-01/virtualnetworkpeerings/predicates.go
@@ -12,19 +12,19 @@ type VirtualNetworkPeeringOperationPredicate struct {
 
 func (p VirtualNetworkPeeringOperationPredicate) Matches(input VirtualNetworkPeering) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/virtualnetworks/predicates.go b/resource-manager/network/2022-09-01/virtualnetworks/predicates.go
index 6b77860abe7..32421738de2 100644
--- a/resource-manager/network/2022-09-01/virtualnetworks/predicates.go
+++ b/resource-manager/network/2022-09-01/virtualnetworks/predicates.go
@@ -11,15 +11,15 @@ type PublicIPDdosProtectionStatusResultOperationPredicate struct {
 
 func (p PublicIPDdosProtectionStatusResultOperationPredicate) Matches(input PublicIPDdosProtectionStatusResult) bool {
 
-	if p.DdosProtectionPlanId != nil && (input.DdosProtectionPlanId == nil && *p.DdosProtectionPlanId != *input.DdosProtectionPlanId) {
+	if p.DdosProtectionPlanId != nil && (input.DdosProtectionPlanId == nil || *p.DdosProtectionPlanId != *input.DdosProtectionPlanId) {
 		return false
 	}
 
-	if p.PublicIPAddress != nil && (input.PublicIPAddress == nil && *p.PublicIPAddress != *input.PublicIPAddress) {
+	if p.PublicIPAddress != nil && (input.PublicIPAddress == nil || *p.PublicIPAddress != *input.PublicIPAddress) {
 		return false
 	}
 
-	if p.PublicIPAddressId != nil && (input.PublicIPAddressId == nil && *p.PublicIPAddressId != *input.PublicIPAddressId) {
+	if p.PublicIPAddressId != nil && (input.PublicIPAddressId == nil || *p.PublicIPAddressId != *input.PublicIPAddressId) {
 		return false
 	}
 
@@ -36,23 +36,23 @@ type VirtualNetworkOperationPredicate struct {
 
 func (p VirtualNetworkOperationPredicate) Matches(input VirtualNetwork) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -68,19 +68,19 @@ type VirtualNetworkUsageOperationPredicate struct {
 
 func (p VirtualNetworkUsageOperationPredicate) Matches(input VirtualNetworkUsage) bool {
 
-	if p.CurrentValue != nil && (input.CurrentValue == nil && *p.CurrentValue != *input.CurrentValue) {
+	if p.CurrentValue != nil && (input.CurrentValue == nil || *p.CurrentValue != *input.CurrentValue) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
-	if p.Unit != nil && (input.Unit == nil && *p.Unit != *input.Unit) {
+	if p.Unit != nil && (input.Unit == nil || *p.Unit != *input.Unit) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/virtualnetworktaps/predicates.go b/resource-manager/network/2022-09-01/virtualnetworktaps/predicates.go
index 73162940ff1..0b7fb5985f4 100644
--- a/resource-manager/network/2022-09-01/virtualnetworktaps/predicates.go
+++ b/resource-manager/network/2022-09-01/virtualnetworktaps/predicates.go
@@ -13,23 +13,23 @@ type VirtualNetworkTapOperationPredicate struct {
 
 func (p VirtualNetworkTapOperationPredicate) Matches(input VirtualNetworkTap) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/virtualrouterpeerings/predicates.go b/resource-manager/network/2022-09-01/virtualrouterpeerings/predicates.go
index df3a5e39161..1e181881675 100644
--- a/resource-manager/network/2022-09-01/virtualrouterpeerings/predicates.go
+++ b/resource-manager/network/2022-09-01/virtualrouterpeerings/predicates.go
@@ -12,19 +12,19 @@ type VirtualRouterPeeringOperationPredicate struct {
 
 func (p VirtualRouterPeeringOperationPredicate) Matches(input VirtualRouterPeering) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/virtualrouters/predicates.go b/resource-manager/network/2022-09-01/virtualrouters/predicates.go
index 8533ca9181c..676ee423641 100644
--- a/resource-manager/network/2022-09-01/virtualrouters/predicates.go
+++ b/resource-manager/network/2022-09-01/virtualrouters/predicates.go
@@ -13,23 +13,23 @@ type VirtualRouterOperationPredicate struct {
 
 func (p VirtualRouterOperationPredicate) Matches(input VirtualRouter) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/virtualwans/predicates.go b/resource-manager/network/2022-09-01/virtualwans/predicates.go
index c8330378f89..880185945ce 100644
--- a/resource-manager/network/2022-09-01/virtualwans/predicates.go
+++ b/resource-manager/network/2022-09-01/virtualwans/predicates.go
@@ -12,19 +12,19 @@ type BgpConnectionOperationPredicate struct {
 
 func (p BgpConnectionOperationPredicate) Matches(input BgpConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,19 +40,19 @@ type HubIPConfigurationOperationPredicate struct {
 
 func (p HubIPConfigurationOperationPredicate) Matches(input HubIPConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -68,19 +68,19 @@ type HubRouteTableOperationPredicate struct {
 
 func (p HubRouteTableOperationPredicate) Matches(input HubRouteTable) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -95,15 +95,15 @@ type HubVirtualNetworkConnectionOperationPredicate struct {
 
 func (p HubVirtualNetworkConnectionOperationPredicate) Matches(input HubVirtualNetworkConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
@@ -120,11 +120,11 @@ type P2SVpnGatewayOperationPredicate struct {
 
 func (p P2SVpnGatewayOperationPredicate) Matches(input P2SVpnGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -132,11 +132,11 @@ func (p P2SVpnGatewayOperationPredicate) Matches(input P2SVpnGateway) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -152,19 +152,19 @@ type RouteMapOperationPredicate struct {
 
 func (p RouteMapOperationPredicate) Matches(input RouteMap) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -180,19 +180,19 @@ type RoutingIntentOperationPredicate struct {
 
 func (p RoutingIntentOperationPredicate) Matches(input RoutingIntent) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -210,15 +210,15 @@ type VirtualHubOperationPredicate struct {
 
 func (p VirtualHubOperationPredicate) Matches(input VirtualHub) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -226,11 +226,11 @@ func (p VirtualHubOperationPredicate) Matches(input VirtualHub) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -245,15 +245,15 @@ type VirtualHubRouteTableV2OperationPredicate struct {
 
 func (p VirtualHubRouteTableV2OperationPredicate) Matches(input VirtualHubRouteTableV2) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
@@ -270,11 +270,11 @@ type VirtualWANOperationPredicate struct {
 
 func (p VirtualWANOperationPredicate) Matches(input VirtualWAN) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -282,11 +282,11 @@ func (p VirtualWANOperationPredicate) Matches(input VirtualWAN) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -301,15 +301,15 @@ type VpnConnectionOperationPredicate struct {
 
 func (p VpnConnectionOperationPredicate) Matches(input VpnConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
@@ -326,11 +326,11 @@ type VpnGatewayOperationPredicate struct {
 
 func (p VpnGatewayOperationPredicate) Matches(input VpnGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -338,11 +338,11 @@ func (p VpnGatewayOperationPredicate) Matches(input VpnGateway) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -358,19 +358,19 @@ type VpnGatewayNatRuleOperationPredicate struct {
 
 func (p VpnGatewayNatRuleOperationPredicate) Matches(input VpnGatewayNatRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -387,23 +387,23 @@ type VpnServerConfigurationOperationPredicate struct {
 
 func (p VpnServerConfigurationOperationPredicate) Matches(input VpnServerConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -419,19 +419,19 @@ type VpnServerConfigurationPolicyGroupOperationPredicate struct {
 
 func (p VpnServerConfigurationPolicyGroupOperationPredicate) Matches(input VpnServerConfigurationPolicyGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -448,11 +448,11 @@ type VpnSiteOperationPredicate struct {
 
 func (p VpnSiteOperationPredicate) Matches(input VpnSite) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -460,11 +460,11 @@ func (p VpnSiteOperationPredicate) Matches(input VpnSite) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -480,19 +480,19 @@ type VpnSiteLinkOperationPredicate struct {
 
 func (p VpnSiteLinkOperationPredicate) Matches(input VpnSiteLink) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -508,19 +508,19 @@ type VpnSiteLinkConnectionOperationPredicate struct {
 
 func (p VpnSiteLinkConnectionOperationPredicate) Matches(input VpnSiteLinkConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/vmsspublicipaddresses/predicates.go b/resource-manager/network/2022-09-01/vmsspublicipaddresses/predicates.go
index 2ba46e3bd91..3173ab41a32 100644
--- a/resource-manager/network/2022-09-01/vmsspublicipaddresses/predicates.go
+++ b/resource-manager/network/2022-09-01/vmsspublicipaddresses/predicates.go
@@ -13,23 +13,23 @@ type PublicIPAddressOperationPredicate struct {
 
 func (p PublicIPAddressOperationPredicate) Matches(input PublicIPAddress) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/webapplicationfirewallpolicies/predicates.go b/resource-manager/network/2022-09-01/webapplicationfirewallpolicies/predicates.go
index 9bdf8d1c8b6..a7973b0a14f 100644
--- a/resource-manager/network/2022-09-01/webapplicationfirewallpolicies/predicates.go
+++ b/resource-manager/network/2022-09-01/webapplicationfirewallpolicies/predicates.go
@@ -13,23 +13,23 @@ type WebApplicationFirewallPolicyOperationPredicate struct {
 
 func (p WebApplicationFirewallPolicyOperationPredicate) Matches(input WebApplicationFirewallPolicy) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-09-01/webcategories/predicates.go b/resource-manager/network/2022-09-01/webcategories/predicates.go
index 28bacd194ee..ab82b0c92b5 100644
--- a/resource-manager/network/2022-09-01/webcategories/predicates.go
+++ b/resource-manager/network/2022-09-01/webcategories/predicates.go
@@ -12,19 +12,19 @@ type AzureWebCategoryOperationPredicate struct {
 
 func (p AzureWebCategoryOperationPredicate) Matches(input AzureWebCategory) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/adminrulecollections/predicates.go b/resource-manager/network/2022-11-01/adminrulecollections/predicates.go
index 2f10067f017..67b37b95643 100644
--- a/resource-manager/network/2022-11-01/adminrulecollections/predicates.go
+++ b/resource-manager/network/2022-11-01/adminrulecollections/predicates.go
@@ -12,19 +12,19 @@ type AdminRuleCollectionOperationPredicate struct {
 
 func (p AdminRuleCollectionOperationPredicate) Matches(input AdminRuleCollection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/applicationgatewayprivateendpointconnections/predicates.go b/resource-manager/network/2022-11-01/applicationgatewayprivateendpointconnections/predicates.go
index ce7e107fd0d..46757c5239b 100644
--- a/resource-manager/network/2022-11-01/applicationgatewayprivateendpointconnections/predicates.go
+++ b/resource-manager/network/2022-11-01/applicationgatewayprivateendpointconnections/predicates.go
@@ -12,19 +12,19 @@ type ApplicationGatewayPrivateEndpointConnectionOperationPredicate struct {
 
 func (p ApplicationGatewayPrivateEndpointConnectionOperationPredicate) Matches(input ApplicationGatewayPrivateEndpointConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/applicationgatewayprivatelinkresources/predicates.go b/resource-manager/network/2022-11-01/applicationgatewayprivatelinkresources/predicates.go
index 717ca511a70..e93c21bb751 100644
--- a/resource-manager/network/2022-11-01/applicationgatewayprivatelinkresources/predicates.go
+++ b/resource-manager/network/2022-11-01/applicationgatewayprivatelinkresources/predicates.go
@@ -12,19 +12,19 @@ type ApplicationGatewayPrivateLinkResourceOperationPredicate struct {
 
 func (p ApplicationGatewayPrivateLinkResourceOperationPredicate) Matches(input ApplicationGatewayPrivateLinkResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/applicationgateways/predicates.go b/resource-manager/network/2022-11-01/applicationgateways/predicates.go
index ff35d27f30c..c51e6f7b000 100644
--- a/resource-manager/network/2022-11-01/applicationgateways/predicates.go
+++ b/resource-manager/network/2022-11-01/applicationgateways/predicates.go
@@ -13,23 +13,23 @@ type ApplicationGatewayOperationPredicate struct {
 
 func (p ApplicationGatewayOperationPredicate) Matches(input ApplicationGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -43,11 +43,11 @@ type ApplicationGatewaySslPredefinedPolicyOperationPredicate struct {
 
 func (p ApplicationGatewaySslPredefinedPolicyOperationPredicate) Matches(input ApplicationGatewaySslPredefinedPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/applicationgatewaywafdynamicmanifests/predicates.go b/resource-manager/network/2022-11-01/applicationgatewaywafdynamicmanifests/predicates.go
index 71fb8558fc1..9714d21637e 100644
--- a/resource-manager/network/2022-11-01/applicationgatewaywafdynamicmanifests/predicates.go
+++ b/resource-manager/network/2022-11-01/applicationgatewaywafdynamicmanifests/predicates.go
@@ -11,15 +11,15 @@ type ApplicationGatewayWafDynamicManifestResultOperationPredicate struct {
 
 func (p ApplicationGatewayWafDynamicManifestResultOperationPredicate) Matches(input ApplicationGatewayWafDynamicManifestResult) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/applicationsecuritygroups/predicates.go b/resource-manager/network/2022-11-01/applicationsecuritygroups/predicates.go
index bb7f348a2a4..6ea534ecd89 100644
--- a/resource-manager/network/2022-11-01/applicationsecuritygroups/predicates.go
+++ b/resource-manager/network/2022-11-01/applicationsecuritygroups/predicates.go
@@ -13,23 +13,23 @@ type ApplicationSecurityGroupOperationPredicate struct {
 
 func (p ApplicationSecurityGroupOperationPredicate) Matches(input ApplicationSecurityGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/availabledelegations/predicates.go b/resource-manager/network/2022-11-01/availabledelegations/predicates.go
index ed867e9cb60..caf6b904077 100644
--- a/resource-manager/network/2022-11-01/availabledelegations/predicates.go
+++ b/resource-manager/network/2022-11-01/availabledelegations/predicates.go
@@ -12,19 +12,19 @@ type AvailableDelegationOperationPredicate struct {
 
 func (p AvailableDelegationOperationPredicate) Matches(input AvailableDelegation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ServiceName != nil && (input.ServiceName == nil && *p.ServiceName != *input.ServiceName) {
+	if p.ServiceName != nil && (input.ServiceName == nil || *p.ServiceName != *input.ServiceName) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/availableservicealiases/predicates.go b/resource-manager/network/2022-11-01/availableservicealiases/predicates.go
index 9949a5723d5..afe2abff9ab 100644
--- a/resource-manager/network/2022-11-01/availableservicealiases/predicates.go
+++ b/resource-manager/network/2022-11-01/availableservicealiases/predicates.go
@@ -12,19 +12,19 @@ type AvailableServiceAliasOperationPredicate struct {
 
 func (p AvailableServiceAliasOperationPredicate) Matches(input AvailableServiceAlias) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceName != nil && (input.ResourceName == nil && *p.ResourceName != *input.ResourceName) {
+	if p.ResourceName != nil && (input.ResourceName == nil || *p.ResourceName != *input.ResourceName) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/azurefirewalls/predicates.go b/resource-manager/network/2022-11-01/azurefirewalls/predicates.go
index eef0c0724f3..68ca8da5623 100644
--- a/resource-manager/network/2022-11-01/azurefirewalls/predicates.go
+++ b/resource-manager/network/2022-11-01/azurefirewalls/predicates.go
@@ -13,23 +13,23 @@ type AzureFirewallOperationPredicate struct {
 
 func (p AzureFirewallOperationPredicate) Matches(input AzureFirewall) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/bastionhosts/predicates.go b/resource-manager/network/2022-11-01/bastionhosts/predicates.go
index a5e3edd0204..3c3835a32d0 100644
--- a/resource-manager/network/2022-11-01/bastionhosts/predicates.go
+++ b/resource-manager/network/2022-11-01/bastionhosts/predicates.go
@@ -18,43 +18,43 @@ type BastionActiveSessionOperationPredicate struct {
 
 func (p BastionActiveSessionOperationPredicate) Matches(input BastionActiveSession) bool {
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
-	if p.SessionDurationInMins != nil && (input.SessionDurationInMins == nil && *p.SessionDurationInMins != *input.SessionDurationInMins) {
+	if p.SessionDurationInMins != nil && (input.SessionDurationInMins == nil || *p.SessionDurationInMins != *input.SessionDurationInMins) {
 		return false
 	}
 
-	if p.SessionId != nil && (input.SessionId == nil && *p.SessionId != *input.SessionId) {
+	if p.SessionId != nil && (input.SessionId == nil || *p.SessionId != *input.SessionId) {
 		return false
 	}
 
-	if p.StartTime != nil && (input.StartTime == nil && *p.StartTime != *input.StartTime) {
+	if p.StartTime != nil && (input.StartTime == nil || *p.StartTime != *input.StartTime) {
 		return false
 	}
 
-	if p.TargetHostName != nil && (input.TargetHostName == nil && *p.TargetHostName != *input.TargetHostName) {
+	if p.TargetHostName != nil && (input.TargetHostName == nil || *p.TargetHostName != *input.TargetHostName) {
 		return false
 	}
 
-	if p.TargetIPAddress != nil && (input.TargetIPAddress == nil && *p.TargetIPAddress != *input.TargetIPAddress) {
+	if p.TargetIPAddress != nil && (input.TargetIPAddress == nil || *p.TargetIPAddress != *input.TargetIPAddress) {
 		return false
 	}
 
-	if p.TargetResourceGroup != nil && (input.TargetResourceGroup == nil && *p.TargetResourceGroup != *input.TargetResourceGroup) {
+	if p.TargetResourceGroup != nil && (input.TargetResourceGroup == nil || *p.TargetResourceGroup != *input.TargetResourceGroup) {
 		return false
 	}
 
-	if p.TargetResourceId != nil && (input.TargetResourceId == nil && *p.TargetResourceId != *input.TargetResourceId) {
+	if p.TargetResourceId != nil && (input.TargetResourceId == nil || *p.TargetResourceId != *input.TargetResourceId) {
 		return false
 	}
 
-	if p.TargetSubscriptionId != nil && (input.TargetSubscriptionId == nil && *p.TargetSubscriptionId != *input.TargetSubscriptionId) {
+	if p.TargetSubscriptionId != nil && (input.TargetSubscriptionId == nil || *p.TargetSubscriptionId != *input.TargetSubscriptionId) {
 		return false
 	}
 
-	if p.UserName != nil && (input.UserName == nil && *p.UserName != *input.UserName) {
+	if p.UserName != nil && (input.UserName == nil || *p.UserName != *input.UserName) {
 		return false
 	}
 
@@ -71,23 +71,23 @@ type BastionHostOperationPredicate struct {
 
 func (p BastionHostOperationPredicate) Matches(input BastionHost) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -102,15 +102,15 @@ type BastionSessionStateOperationPredicate struct {
 
 func (p BastionSessionStateOperationPredicate) Matches(input BastionSessionState) bool {
 
-	if p.Message != nil && (input.Message == nil && *p.Message != *input.Message) {
+	if p.Message != nil && (input.Message == nil || *p.Message != *input.Message) {
 		return false
 	}
 
-	if p.SessionId != nil && (input.SessionId == nil && *p.SessionId != *input.SessionId) {
+	if p.SessionId != nil && (input.SessionId == nil || *p.SessionId != *input.SessionId) {
 		return false
 	}
 
-	if p.State != nil && (input.State == nil && *p.State != *input.State) {
+	if p.State != nil && (input.State == nil || *p.State != *input.State) {
 		return false
 	}
 
@@ -125,15 +125,15 @@ type BastionShareableLinkOperationPredicate struct {
 
 func (p BastionShareableLinkOperationPredicate) Matches(input BastionShareableLink) bool {
 
-	if p.Bsl != nil && (input.Bsl == nil && *p.Bsl != *input.Bsl) {
+	if p.Bsl != nil && (input.Bsl == nil || *p.Bsl != *input.Bsl) {
 		return false
 	}
 
-	if p.CreatedAt != nil && (input.CreatedAt == nil && *p.CreatedAt != *input.CreatedAt) {
+	if p.CreatedAt != nil && (input.CreatedAt == nil || *p.CreatedAt != *input.CreatedAt) {
 		return false
 	}
 
-	if p.Message != nil && (input.Message == nil && *p.Message != *input.Message) {
+	if p.Message != nil && (input.Message == nil || *p.Message != *input.Message) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/bastionshareablelink/predicates.go b/resource-manager/network/2022-11-01/bastionshareablelink/predicates.go
index ce72bc40681..15f07095262 100644
--- a/resource-manager/network/2022-11-01/bastionshareablelink/predicates.go
+++ b/resource-manager/network/2022-11-01/bastionshareablelink/predicates.go
@@ -11,15 +11,15 @@ type BastionShareableLinkOperationPredicate struct {
 
 func (p BastionShareableLinkOperationPredicate) Matches(input BastionShareableLink) bool {
 
-	if p.Bsl != nil && (input.Bsl == nil && *p.Bsl != *input.Bsl) {
+	if p.Bsl != nil && (input.Bsl == nil || *p.Bsl != *input.Bsl) {
 		return false
 	}
 
-	if p.CreatedAt != nil && (input.CreatedAt == nil && *p.CreatedAt != *input.CreatedAt) {
+	if p.CreatedAt != nil && (input.CreatedAt == nil || *p.CreatedAt != *input.CreatedAt) {
 		return false
 	}
 
-	if p.Message != nil && (input.Message == nil && *p.Message != *input.Message) {
+	if p.Message != nil && (input.Message == nil || *p.Message != *input.Message) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/bgpservicecommunities/predicates.go b/resource-manager/network/2022-11-01/bgpservicecommunities/predicates.go
index ae5019b967b..2e90f55ae55 100644
--- a/resource-manager/network/2022-11-01/bgpservicecommunities/predicates.go
+++ b/resource-manager/network/2022-11-01/bgpservicecommunities/predicates.go
@@ -12,19 +12,19 @@ type BgpServiceCommunityOperationPredicate struct {
 
 func (p BgpServiceCommunityOperationPredicate) Matches(input BgpServiceCommunity) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/cloudservicepublicipaddresses/predicates.go b/resource-manager/network/2022-11-01/cloudservicepublicipaddresses/predicates.go
index 0c1aab1e694..f27f03144ee 100644
--- a/resource-manager/network/2022-11-01/cloudservicepublicipaddresses/predicates.go
+++ b/resource-manager/network/2022-11-01/cloudservicepublicipaddresses/predicates.go
@@ -13,23 +13,23 @@ type PublicIPAddressOperationPredicate struct {
 
 func (p PublicIPAddressOperationPredicate) Matches(input PublicIPAddress) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/connectivityconfigurations/predicates.go b/resource-manager/network/2022-11-01/connectivityconfigurations/predicates.go
index a581c573c65..ecab73247f2 100644
--- a/resource-manager/network/2022-11-01/connectivityconfigurations/predicates.go
+++ b/resource-manager/network/2022-11-01/connectivityconfigurations/predicates.go
@@ -12,19 +12,19 @@ type ConnectivityConfigurationOperationPredicate struct {
 
 func (p ConnectivityConfigurationOperationPredicate) Matches(input ConnectivityConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/customipprefixes/predicates.go b/resource-manager/network/2022-11-01/customipprefixes/predicates.go
index a7d5ffe920a..288f9cfa042 100644
--- a/resource-manager/network/2022-11-01/customipprefixes/predicates.go
+++ b/resource-manager/network/2022-11-01/customipprefixes/predicates.go
@@ -13,23 +13,23 @@ type CustomIPPrefixOperationPredicate struct {
 
 func (p CustomIPPrefixOperationPredicate) Matches(input CustomIPPrefix) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/ddosprotectionplans/predicates.go b/resource-manager/network/2022-11-01/ddosprotectionplans/predicates.go
index f0bd539d370..6ad9bbf5374 100644
--- a/resource-manager/network/2022-11-01/ddosprotectionplans/predicates.go
+++ b/resource-manager/network/2022-11-01/ddosprotectionplans/predicates.go
@@ -13,23 +13,23 @@ type DdosProtectionPlanOperationPredicate struct {
 
 func (p DdosProtectionPlanOperationPredicate) Matches(input DdosProtectionPlan) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/dscpconfigurations/predicates.go b/resource-manager/network/2022-11-01/dscpconfigurations/predicates.go
index 2281e144720..7628df6beb6 100644
--- a/resource-manager/network/2022-11-01/dscpconfigurations/predicates.go
+++ b/resource-manager/network/2022-11-01/dscpconfigurations/predicates.go
@@ -13,23 +13,23 @@ type DscpConfigurationOperationPredicate struct {
 
 func (p DscpConfigurationOperationPredicate) Matches(input DscpConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/endpointservices/predicates.go b/resource-manager/network/2022-11-01/endpointservices/predicates.go
index 1e48205c952..9a5ec06a288 100644
--- a/resource-manager/network/2022-11-01/endpointservices/predicates.go
+++ b/resource-manager/network/2022-11-01/endpointservices/predicates.go
@@ -11,15 +11,15 @@ type EndpointServiceResultOperationPredicate struct {
 
 func (p EndpointServiceResultOperationPredicate) Matches(input EndpointServiceResult) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/expressroutecircuitauthorizations/predicates.go b/resource-manager/network/2022-11-01/expressroutecircuitauthorizations/predicates.go
index 4a3d75102ac..3533e80a13e 100644
--- a/resource-manager/network/2022-11-01/expressroutecircuitauthorizations/predicates.go
+++ b/resource-manager/network/2022-11-01/expressroutecircuitauthorizations/predicates.go
@@ -12,19 +12,19 @@ type ExpressRouteCircuitAuthorizationOperationPredicate struct {
 
 func (p ExpressRouteCircuitAuthorizationOperationPredicate) Matches(input ExpressRouteCircuitAuthorization) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/expressroutecircuitconnections/predicates.go b/resource-manager/network/2022-11-01/expressroutecircuitconnections/predicates.go
index 697aab56df9..6c65b4df05d 100644
--- a/resource-manager/network/2022-11-01/expressroutecircuitconnections/predicates.go
+++ b/resource-manager/network/2022-11-01/expressroutecircuitconnections/predicates.go
@@ -12,19 +12,19 @@ type ExpressRouteCircuitConnectionOperationPredicate struct {
 
 func (p ExpressRouteCircuitConnectionOperationPredicate) Matches(input ExpressRouteCircuitConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/expressroutecircuitpeerings/predicates.go b/resource-manager/network/2022-11-01/expressroutecircuitpeerings/predicates.go
index 8b3551606e8..1e725c4e63a 100644
--- a/resource-manager/network/2022-11-01/expressroutecircuitpeerings/predicates.go
+++ b/resource-manager/network/2022-11-01/expressroutecircuitpeerings/predicates.go
@@ -12,19 +12,19 @@ type ExpressRouteCircuitPeeringOperationPredicate struct {
 
 func (p ExpressRouteCircuitPeeringOperationPredicate) Matches(input ExpressRouteCircuitPeering) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/expressroutecircuits/predicates.go b/resource-manager/network/2022-11-01/expressroutecircuits/predicates.go
index c0013d9656e..3fdbc040dbf 100644
--- a/resource-manager/network/2022-11-01/expressroutecircuits/predicates.go
+++ b/resource-manager/network/2022-11-01/expressroutecircuits/predicates.go
@@ -13,23 +13,23 @@ type ExpressRouteCircuitOperationPredicate struct {
 
 func (p ExpressRouteCircuitOperationPredicate) Matches(input ExpressRouteCircuit) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/expressroutecrossconnectionpeerings/predicates.go b/resource-manager/network/2022-11-01/expressroutecrossconnectionpeerings/predicates.go
index a21509eb010..abec5984ec1 100644
--- a/resource-manager/network/2022-11-01/expressroutecrossconnectionpeerings/predicates.go
+++ b/resource-manager/network/2022-11-01/expressroutecrossconnectionpeerings/predicates.go
@@ -11,15 +11,15 @@ type ExpressRouteCrossConnectionPeeringOperationPredicate struct {
 
 func (p ExpressRouteCrossConnectionPeeringOperationPredicate) Matches(input ExpressRouteCrossConnectionPeering) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/expressroutecrossconnections/predicates.go b/resource-manager/network/2022-11-01/expressroutecrossconnections/predicates.go
index 2b30277eb5d..f3d9b3a8dff 100644
--- a/resource-manager/network/2022-11-01/expressroutecrossconnections/predicates.go
+++ b/resource-manager/network/2022-11-01/expressroutecrossconnections/predicates.go
@@ -13,23 +13,23 @@ type ExpressRouteCrossConnectionOperationPredicate struct {
 
 func (p ExpressRouteCrossConnectionOperationPredicate) Matches(input ExpressRouteCrossConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/expressroutelinks/predicates.go b/resource-manager/network/2022-11-01/expressroutelinks/predicates.go
index c5955ad29e5..bd6127afc55 100644
--- a/resource-manager/network/2022-11-01/expressroutelinks/predicates.go
+++ b/resource-manager/network/2022-11-01/expressroutelinks/predicates.go
@@ -11,15 +11,15 @@ type ExpressRouteLinkOperationPredicate struct {
 
 func (p ExpressRouteLinkOperationPredicate) Matches(input ExpressRouteLink) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/expressrouteportauthorizations/predicates.go b/resource-manager/network/2022-11-01/expressrouteportauthorizations/predicates.go
index 2cdc970dad0..d12fc29e52a 100644
--- a/resource-manager/network/2022-11-01/expressrouteportauthorizations/predicates.go
+++ b/resource-manager/network/2022-11-01/expressrouteportauthorizations/predicates.go
@@ -12,19 +12,19 @@ type ExpressRoutePortAuthorizationOperationPredicate struct {
 
 func (p ExpressRoutePortAuthorizationOperationPredicate) Matches(input ExpressRoutePortAuthorization) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/expressrouteports/predicates.go b/resource-manager/network/2022-11-01/expressrouteports/predicates.go
index 26d4591a65f..7339fac991b 100644
--- a/resource-manager/network/2022-11-01/expressrouteports/predicates.go
+++ b/resource-manager/network/2022-11-01/expressrouteports/predicates.go
@@ -13,23 +13,23 @@ type ExpressRoutePortOperationPredicate struct {
 
 func (p ExpressRoutePortOperationPredicate) Matches(input ExpressRoutePort) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/expressrouteportslocations/predicates.go b/resource-manager/network/2022-11-01/expressrouteportslocations/predicates.go
index 43649ada37d..3b345c2e1f5 100644
--- a/resource-manager/network/2022-11-01/expressrouteportslocations/predicates.go
+++ b/resource-manager/network/2022-11-01/expressrouteportslocations/predicates.go
@@ -12,19 +12,19 @@ type ExpressRoutePortsLocationOperationPredicate struct {
 
 func (p ExpressRoutePortsLocationOperationPredicate) Matches(input ExpressRoutePortsLocation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/expressrouteserviceproviders/predicates.go b/resource-manager/network/2022-11-01/expressrouteserviceproviders/predicates.go
index baa5b8aba7a..d2c605983d7 100644
--- a/resource-manager/network/2022-11-01/expressrouteserviceproviders/predicates.go
+++ b/resource-manager/network/2022-11-01/expressrouteserviceproviders/predicates.go
@@ -12,19 +12,19 @@ type ExpressRouteServiceProviderOperationPredicate struct {
 
 func (p ExpressRouteServiceProviderOperationPredicate) Matches(input ExpressRouteServiceProvider) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/firewallpolicies/predicates.go b/resource-manager/network/2022-11-01/firewallpolicies/predicates.go
index b95e12c63e2..2640042ba7a 100644
--- a/resource-manager/network/2022-11-01/firewallpolicies/predicates.go
+++ b/resource-manager/network/2022-11-01/firewallpolicies/predicates.go
@@ -13,23 +13,23 @@ type FirewallPolicyOperationPredicate struct {
 
 func (p FirewallPolicyOperationPredicate) Matches(input FirewallPolicy) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/firewallpolicyrulecollectiongroups/predicates.go b/resource-manager/network/2022-11-01/firewallpolicyrulecollectiongroups/predicates.go
index c190891d1a1..9762acada56 100644
--- a/resource-manager/network/2022-11-01/firewallpolicyrulecollectiongroups/predicates.go
+++ b/resource-manager/network/2022-11-01/firewallpolicyrulecollectiongroups/predicates.go
@@ -12,19 +12,19 @@ type FirewallPolicyRuleCollectionGroupOperationPredicate struct {
 
 func (p FirewallPolicyRuleCollectionGroupOperationPredicate) Matches(input FirewallPolicyRuleCollectionGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/flowlogs/predicates.go b/resource-manager/network/2022-11-01/flowlogs/predicates.go
index 1aa47092e55..746df2611cc 100644
--- a/resource-manager/network/2022-11-01/flowlogs/predicates.go
+++ b/resource-manager/network/2022-11-01/flowlogs/predicates.go
@@ -13,23 +13,23 @@ type FlowLogOperationPredicate struct {
 
 func (p FlowLogOperationPredicate) Matches(input FlowLog) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/ipallocations/predicates.go b/resource-manager/network/2022-11-01/ipallocations/predicates.go
index 866a19a7190..5f4e136ae66 100644
--- a/resource-manager/network/2022-11-01/ipallocations/predicates.go
+++ b/resource-manager/network/2022-11-01/ipallocations/predicates.go
@@ -13,23 +13,23 @@ type IPAllocationOperationPredicate struct {
 
 func (p IPAllocationOperationPredicate) Matches(input IPAllocation) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/ipgroups/predicates.go b/resource-manager/network/2022-11-01/ipgroups/predicates.go
index 705b10e2ed0..a64e98c2290 100644
--- a/resource-manager/network/2022-11-01/ipgroups/predicates.go
+++ b/resource-manager/network/2022-11-01/ipgroups/predicates.go
@@ -13,23 +13,23 @@ type IPGroupOperationPredicate struct {
 
 func (p IPGroupOperationPredicate) Matches(input IPGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/loadbalancers/predicates.go b/resource-manager/network/2022-11-01/loadbalancers/predicates.go
index b5cc68245b6..82f247704c6 100644
--- a/resource-manager/network/2022-11-01/loadbalancers/predicates.go
+++ b/resource-manager/network/2022-11-01/loadbalancers/predicates.go
@@ -12,19 +12,19 @@ type BackendAddressPoolOperationPredicate struct {
 
 func (p BackendAddressPoolOperationPredicate) Matches(input BackendAddressPool) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,19 +40,19 @@ type FrontendIPConfigurationOperationPredicate struct {
 
 func (p FrontendIPConfigurationOperationPredicate) Matches(input FrontendIPConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -68,19 +68,19 @@ type InboundNatRuleOperationPredicate struct {
 
 func (p InboundNatRuleOperationPredicate) Matches(input InboundNatRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -97,23 +97,23 @@ type LoadBalancerOperationPredicate struct {
 
 func (p LoadBalancerOperationPredicate) Matches(input LoadBalancer) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -129,19 +129,19 @@ type LoadBalancingRuleOperationPredicate struct {
 
 func (p LoadBalancingRuleOperationPredicate) Matches(input LoadBalancingRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -158,23 +158,23 @@ type NetworkInterfaceOperationPredicate struct {
 
 func (p NetworkInterfaceOperationPredicate) Matches(input NetworkInterface) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -190,19 +190,19 @@ type OutboundRuleOperationPredicate struct {
 
 func (p OutboundRuleOperationPredicate) Matches(input OutboundRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -218,19 +218,19 @@ type ProbeOperationPredicate struct {
 
 func (p ProbeOperationPredicate) Matches(input Probe) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/localnetworkgateways/predicates.go b/resource-manager/network/2022-11-01/localnetworkgateways/predicates.go
index 462c9037886..d4e529f8a9c 100644
--- a/resource-manager/network/2022-11-01/localnetworkgateways/predicates.go
+++ b/resource-manager/network/2022-11-01/localnetworkgateways/predicates.go
@@ -13,23 +13,23 @@ type LocalNetworkGatewayOperationPredicate struct {
 
 func (p LocalNetworkGatewayOperationPredicate) Matches(input LocalNetworkGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/natgateways/predicates.go b/resource-manager/network/2022-11-01/natgateways/predicates.go
index d5cfb6b66fc..c0e09cf2f07 100644
--- a/resource-manager/network/2022-11-01/natgateways/predicates.go
+++ b/resource-manager/network/2022-11-01/natgateways/predicates.go
@@ -13,23 +13,23 @@ type NatGatewayOperationPredicate struct {
 
 func (p NatGatewayOperationPredicate) Matches(input NatGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/networkgroups/predicates.go b/resource-manager/network/2022-11-01/networkgroups/predicates.go
index d38c9efbbfc..621d0d7b40a 100644
--- a/resource-manager/network/2022-11-01/networkgroups/predicates.go
+++ b/resource-manager/network/2022-11-01/networkgroups/predicates.go
@@ -12,19 +12,19 @@ type NetworkGroupOperationPredicate struct {
 
 func (p NetworkGroupOperationPredicate) Matches(input NetworkGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/networkinterfaces/predicates.go b/resource-manager/network/2022-11-01/networkinterfaces/predicates.go
index 941725ff11e..1bdf1a16800 100644
--- a/resource-manager/network/2022-11-01/networkinterfaces/predicates.go
+++ b/resource-manager/network/2022-11-01/networkinterfaces/predicates.go
@@ -13,23 +13,23 @@ type LoadBalancerOperationPredicate struct {
 
 func (p LoadBalancerOperationPredicate) Matches(input LoadBalancer) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -46,23 +46,23 @@ type NetworkInterfaceOperationPredicate struct {
 
 func (p NetworkInterfaceOperationPredicate) Matches(input NetworkInterface) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -78,19 +78,19 @@ type NetworkInterfaceIPConfigurationOperationPredicate struct {
 
 func (p NetworkInterfaceIPConfigurationOperationPredicate) Matches(input NetworkInterfaceIPConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -106,19 +106,19 @@ type NetworkInterfaceTapConfigurationOperationPredicate struct {
 
 func (p NetworkInterfaceTapConfigurationOperationPredicate) Matches(input NetworkInterfaceTapConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/networkmanagerconnections/predicates.go b/resource-manager/network/2022-11-01/networkmanagerconnections/predicates.go
index a4d1d456e2e..145b7b7261a 100644
--- a/resource-manager/network/2022-11-01/networkmanagerconnections/predicates.go
+++ b/resource-manager/network/2022-11-01/networkmanagerconnections/predicates.go
@@ -12,19 +12,19 @@ type NetworkManagerConnectionOperationPredicate struct {
 
 func (p NetworkManagerConnectionOperationPredicate) Matches(input NetworkManagerConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/networkmanagers/predicates.go b/resource-manager/network/2022-11-01/networkmanagers/predicates.go
index fee18f9eea0..7c1597c2666 100644
--- a/resource-manager/network/2022-11-01/networkmanagers/predicates.go
+++ b/resource-manager/network/2022-11-01/networkmanagers/predicates.go
@@ -13,23 +13,23 @@ type NetworkManagerOperationPredicate struct {
 
 func (p NetworkManagerOperationPredicate) Matches(input NetworkManager) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/networkprofiles/predicates.go b/resource-manager/network/2022-11-01/networkprofiles/predicates.go
index c1ae5ce4c79..c8b72ff46b2 100644
--- a/resource-manager/network/2022-11-01/networkprofiles/predicates.go
+++ b/resource-manager/network/2022-11-01/networkprofiles/predicates.go
@@ -13,23 +13,23 @@ type NetworkProfileOperationPredicate struct {
 
 func (p NetworkProfileOperationPredicate) Matches(input NetworkProfile) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/networksecuritygroups/predicates.go b/resource-manager/network/2022-11-01/networksecuritygroups/predicates.go
index 156bd00cd3d..b9f6d3f3df5 100644
--- a/resource-manager/network/2022-11-01/networksecuritygroups/predicates.go
+++ b/resource-manager/network/2022-11-01/networksecuritygroups/predicates.go
@@ -13,23 +13,23 @@ type NetworkSecurityGroupOperationPredicate struct {
 
 func (p NetworkSecurityGroupOperationPredicate) Matches(input NetworkSecurityGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/networkvirtualappliances/predicates.go b/resource-manager/network/2022-11-01/networkvirtualappliances/predicates.go
index d9e9dfa93ea..676b2af6c25 100644
--- a/resource-manager/network/2022-11-01/networkvirtualappliances/predicates.go
+++ b/resource-manager/network/2022-11-01/networkvirtualappliances/predicates.go
@@ -13,23 +13,23 @@ type NetworkVirtualApplianceOperationPredicate struct {
 
 func (p NetworkVirtualApplianceOperationPredicate) Matches(input NetworkVirtualAppliance) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/peerexpressroutecircuitconnections/predicates.go b/resource-manager/network/2022-11-01/peerexpressroutecircuitconnections/predicates.go
index 967ae9d3147..c0766bb2d18 100644
--- a/resource-manager/network/2022-11-01/peerexpressroutecircuitconnections/predicates.go
+++ b/resource-manager/network/2022-11-01/peerexpressroutecircuitconnections/predicates.go
@@ -12,19 +12,19 @@ type PeerExpressRouteCircuitConnectionOperationPredicate struct {
 
 func (p PeerExpressRouteCircuitConnectionOperationPredicate) Matches(input PeerExpressRouteCircuitConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/privatednszonegroups/predicates.go b/resource-manager/network/2022-11-01/privatednszonegroups/predicates.go
index f77b300cd94..4d27803d6e2 100644
--- a/resource-manager/network/2022-11-01/privatednszonegroups/predicates.go
+++ b/resource-manager/network/2022-11-01/privatednszonegroups/predicates.go
@@ -11,15 +11,15 @@ type PrivateDnsZoneGroupOperationPredicate struct {
 
 func (p PrivateDnsZoneGroupOperationPredicate) Matches(input PrivateDnsZoneGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/privateendpoints/predicates.go b/resource-manager/network/2022-11-01/privateendpoints/predicates.go
index c2c9137a231..c99098d0163 100644
--- a/resource-manager/network/2022-11-01/privateendpoints/predicates.go
+++ b/resource-manager/network/2022-11-01/privateendpoints/predicates.go
@@ -13,23 +13,23 @@ type AvailablePrivateEndpointTypeOperationPredicate struct {
 
 func (p AvailablePrivateEndpointTypeOperationPredicate) Matches(input AvailablePrivateEndpointType) bool {
 
-	if p.DisplayName != nil && (input.DisplayName == nil && *p.DisplayName != *input.DisplayName) {
+	if p.DisplayName != nil && (input.DisplayName == nil || *p.DisplayName != *input.DisplayName) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceName != nil && (input.ResourceName == nil && *p.ResourceName != *input.ResourceName) {
+	if p.ResourceName != nil && (input.ResourceName == nil || *p.ResourceName != *input.ResourceName) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -46,23 +46,23 @@ type PrivateEndpointOperationPredicate struct {
 
 func (p PrivateEndpointOperationPredicate) Matches(input PrivateEndpoint) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/privatelinkservices/predicates.go b/resource-manager/network/2022-11-01/privatelinkservices/predicates.go
index 44963c73ff0..f7e18f9feee 100644
--- a/resource-manager/network/2022-11-01/privatelinkservices/predicates.go
+++ b/resource-manager/network/2022-11-01/privatelinkservices/predicates.go
@@ -9,7 +9,7 @@ type AutoApprovedPrivateLinkServiceOperationPredicate struct {
 
 func (p AutoApprovedPrivateLinkServiceOperationPredicate) Matches(input AutoApprovedPrivateLinkService) bool {
 
-	if p.PrivateLinkService != nil && (input.PrivateLinkService == nil && *p.PrivateLinkService != *input.PrivateLinkService) {
+	if p.PrivateLinkService != nil && (input.PrivateLinkService == nil || *p.PrivateLinkService != *input.PrivateLinkService) {
 		return false
 	}
 
@@ -25,19 +25,19 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -54,23 +54,23 @@ type PrivateLinkServiceOperationPredicate struct {
 
 func (p PrivateLinkServiceOperationPredicate) Matches(input PrivateLinkService) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/publicipaddresses/predicates.go b/resource-manager/network/2022-11-01/publicipaddresses/predicates.go
index 9d8f3f36a5b..07d29ffa733 100644
--- a/resource-manager/network/2022-11-01/publicipaddresses/predicates.go
+++ b/resource-manager/network/2022-11-01/publicipaddresses/predicates.go
@@ -13,23 +13,23 @@ type PublicIPAddressOperationPredicate struct {
 
 func (p PublicIPAddressOperationPredicate) Matches(input PublicIPAddress) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/publicipprefixes/predicates.go b/resource-manager/network/2022-11-01/publicipprefixes/predicates.go
index 26580cf1658..7deb3ca2bbf 100644
--- a/resource-manager/network/2022-11-01/publicipprefixes/predicates.go
+++ b/resource-manager/network/2022-11-01/publicipprefixes/predicates.go
@@ -13,23 +13,23 @@ type PublicIPPrefixOperationPredicate struct {
 
 func (p PublicIPPrefixOperationPredicate) Matches(input PublicIPPrefix) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/routefilterrules/predicates.go b/resource-manager/network/2022-11-01/routefilterrules/predicates.go
index 439bf5e7c60..3067b052089 100644
--- a/resource-manager/network/2022-11-01/routefilterrules/predicates.go
+++ b/resource-manager/network/2022-11-01/routefilterrules/predicates.go
@@ -12,19 +12,19 @@ type RouteFilterRuleOperationPredicate struct {
 
 func (p RouteFilterRuleOperationPredicate) Matches(input RouteFilterRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/routefilters/predicates.go b/resource-manager/network/2022-11-01/routefilters/predicates.go
index f2e9903f324..62b69547730 100644
--- a/resource-manager/network/2022-11-01/routefilters/predicates.go
+++ b/resource-manager/network/2022-11-01/routefilters/predicates.go
@@ -13,11 +13,11 @@ type RouteFilterOperationPredicate struct {
 
 func (p RouteFilterOperationPredicate) Matches(input RouteFilter) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p RouteFilterOperationPredicate) Matches(input RouteFilter) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/routes/predicates.go b/resource-manager/network/2022-11-01/routes/predicates.go
index 9db89e208d7..b0ff24a6573 100644
--- a/resource-manager/network/2022-11-01/routes/predicates.go
+++ b/resource-manager/network/2022-11-01/routes/predicates.go
@@ -12,19 +12,19 @@ type RouteOperationPredicate struct {
 
 func (p RouteOperationPredicate) Matches(input Route) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/routetables/predicates.go b/resource-manager/network/2022-11-01/routetables/predicates.go
index d609a04968c..e1d89b9fbd4 100644
--- a/resource-manager/network/2022-11-01/routetables/predicates.go
+++ b/resource-manager/network/2022-11-01/routetables/predicates.go
@@ -13,23 +13,23 @@ type RouteTableOperationPredicate struct {
 
 func (p RouteTableOperationPredicate) Matches(input RouteTable) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/scopeconnections/predicates.go b/resource-manager/network/2022-11-01/scopeconnections/predicates.go
index 0900eab97ca..eda309664f4 100644
--- a/resource-manager/network/2022-11-01/scopeconnections/predicates.go
+++ b/resource-manager/network/2022-11-01/scopeconnections/predicates.go
@@ -12,19 +12,19 @@ type ScopeConnectionOperationPredicate struct {
 
 func (p ScopeConnectionOperationPredicate) Matches(input ScopeConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/securityadminconfigurations/predicates.go b/resource-manager/network/2022-11-01/securityadminconfigurations/predicates.go
index 87b42dd3ac4..bcc5de9a6a8 100644
--- a/resource-manager/network/2022-11-01/securityadminconfigurations/predicates.go
+++ b/resource-manager/network/2022-11-01/securityadminconfigurations/predicates.go
@@ -12,19 +12,19 @@ type SecurityAdminConfigurationOperationPredicate struct {
 
 func (p SecurityAdminConfigurationOperationPredicate) Matches(input SecurityAdminConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/securitypartnerproviders/predicates.go b/resource-manager/network/2022-11-01/securitypartnerproviders/predicates.go
index de30add5a7f..ef826d6c55f 100644
--- a/resource-manager/network/2022-11-01/securitypartnerproviders/predicates.go
+++ b/resource-manager/network/2022-11-01/securitypartnerproviders/predicates.go
@@ -13,23 +13,23 @@ type SecurityPartnerProviderOperationPredicate struct {
 
 func (p SecurityPartnerProviderOperationPredicate) Matches(input SecurityPartnerProvider) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/securityrules/predicates.go b/resource-manager/network/2022-11-01/securityrules/predicates.go
index 1e328f61d2d..adf918c9ac4 100644
--- a/resource-manager/network/2022-11-01/securityrules/predicates.go
+++ b/resource-manager/network/2022-11-01/securityrules/predicates.go
@@ -12,19 +12,19 @@ type SecurityRuleOperationPredicate struct {
 
 func (p SecurityRuleOperationPredicate) Matches(input SecurityRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/serviceendpointpolicies/predicates.go b/resource-manager/network/2022-11-01/serviceendpointpolicies/predicates.go
index 9fe8475bd27..ddd972a1d9d 100644
--- a/resource-manager/network/2022-11-01/serviceendpointpolicies/predicates.go
+++ b/resource-manager/network/2022-11-01/serviceendpointpolicies/predicates.go
@@ -14,27 +14,27 @@ type ServiceEndpointPolicyOperationPredicate struct {
 
 func (p ServiceEndpointPolicyOperationPredicate) Matches(input ServiceEndpointPolicy) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/serviceendpointpolicydefinitions/predicates.go b/resource-manager/network/2022-11-01/serviceendpointpolicydefinitions/predicates.go
index b92a3589171..a7a08fa9deb 100644
--- a/resource-manager/network/2022-11-01/serviceendpointpolicydefinitions/predicates.go
+++ b/resource-manager/network/2022-11-01/serviceendpointpolicydefinitions/predicates.go
@@ -12,19 +12,19 @@ type ServiceEndpointPolicyDefinitionOperationPredicate struct {
 
 func (p ServiceEndpointPolicyDefinitionOperationPredicate) Matches(input ServiceEndpointPolicyDefinition) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/servicetags/predicates.go b/resource-manager/network/2022-11-01/servicetags/predicates.go
index 01e183fee6a..e10bffe6a4f 100644
--- a/resource-manager/network/2022-11-01/servicetags/predicates.go
+++ b/resource-manager/network/2022-11-01/servicetags/predicates.go
@@ -11,15 +11,15 @@ type ServiceTagInformationOperationPredicate struct {
 
 func (p ServiceTagInformationOperationPredicate) Matches(input ServiceTagInformation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ServiceTagChangeNumber != nil && (input.ServiceTagChangeNumber == nil && *p.ServiceTagChangeNumber != *input.ServiceTagChangeNumber) {
+	if p.ServiceTagChangeNumber != nil && (input.ServiceTagChangeNumber == nil || *p.ServiceTagChangeNumber != *input.ServiceTagChangeNumber) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/staticmembers/predicates.go b/resource-manager/network/2022-11-01/staticmembers/predicates.go
index 7b5a1906bbf..0fb08a96da7 100644
--- a/resource-manager/network/2022-11-01/staticmembers/predicates.go
+++ b/resource-manager/network/2022-11-01/staticmembers/predicates.go
@@ -12,19 +12,19 @@ type StaticMemberOperationPredicate struct {
 
 func (p StaticMemberOperationPredicate) Matches(input StaticMember) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/subnets/predicates.go b/resource-manager/network/2022-11-01/subnets/predicates.go
index 7c9a9678660..33b8979e3cc 100644
--- a/resource-manager/network/2022-11-01/subnets/predicates.go
+++ b/resource-manager/network/2022-11-01/subnets/predicates.go
@@ -12,19 +12,19 @@ type SubnetOperationPredicate struct {
 
 func (p SubnetOperationPredicate) Matches(input Subnet) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/usages/predicates.go b/resource-manager/network/2022-11-01/usages/predicates.go
index a37fa34c531..ad3b401c1ce 100644
--- a/resource-manager/network/2022-11-01/usages/predicates.go
+++ b/resource-manager/network/2022-11-01/usages/predicates.go
@@ -15,7 +15,7 @@ func (p UsageOperationPredicate) Matches(input Usage) bool {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/virtualappliancesites/predicates.go b/resource-manager/network/2022-11-01/virtualappliancesites/predicates.go
index a416f83b081..af31f940d24 100644
--- a/resource-manager/network/2022-11-01/virtualappliancesites/predicates.go
+++ b/resource-manager/network/2022-11-01/virtualappliancesites/predicates.go
@@ -12,19 +12,19 @@ type VirtualApplianceSiteOperationPredicate struct {
 
 func (p VirtualApplianceSiteOperationPredicate) Matches(input VirtualApplianceSite) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/virtualapplianceskus/predicates.go b/resource-manager/network/2022-11-01/virtualapplianceskus/predicates.go
index 651b08c3f2b..758bba40370 100644
--- a/resource-manager/network/2022-11-01/virtualapplianceskus/predicates.go
+++ b/resource-manager/network/2022-11-01/virtualapplianceskus/predicates.go
@@ -13,23 +13,23 @@ type NetworkVirtualApplianceSkuOperationPredicate struct {
 
 func (p NetworkVirtualApplianceSkuOperationPredicate) Matches(input NetworkVirtualApplianceSku) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/virtualnetworkgatewayconnections/predicates.go b/resource-manager/network/2022-11-01/virtualnetworkgatewayconnections/predicates.go
index 3b275eedb99..c1fe558dd66 100644
--- a/resource-manager/network/2022-11-01/virtualnetworkgatewayconnections/predicates.go
+++ b/resource-manager/network/2022-11-01/virtualnetworkgatewayconnections/predicates.go
@@ -13,23 +13,23 @@ type VirtualNetworkGatewayConnectionOperationPredicate struct {
 
 func (p VirtualNetworkGatewayConnectionOperationPredicate) Matches(input VirtualNetworkGatewayConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/virtualnetworkgateways/predicates.go b/resource-manager/network/2022-11-01/virtualnetworkgateways/predicates.go
index 4f5901d8f83..e03cad8f7b6 100644
--- a/resource-manager/network/2022-11-01/virtualnetworkgateways/predicates.go
+++ b/resource-manager/network/2022-11-01/virtualnetworkgateways/predicates.go
@@ -13,23 +13,23 @@ type VirtualNetworkGatewayOperationPredicate struct {
 
 func (p VirtualNetworkGatewayOperationPredicate) Matches(input VirtualNetworkGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -46,23 +46,23 @@ type VirtualNetworkGatewayConnectionListEntityOperationPredicate struct {
 
 func (p VirtualNetworkGatewayConnectionListEntityOperationPredicate) Matches(input VirtualNetworkGatewayConnectionListEntity) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -78,19 +78,19 @@ type VirtualNetworkGatewayNatRuleOperationPredicate struct {
 
 func (p VirtualNetworkGatewayNatRuleOperationPredicate) Matches(input VirtualNetworkGatewayNatRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/virtualnetworkpeerings/predicates.go b/resource-manager/network/2022-11-01/virtualnetworkpeerings/predicates.go
index 0435384a5d6..a945839e0b2 100644
--- a/resource-manager/network/2022-11-01/virtualnetworkpeerings/predicates.go
+++ b/resource-manager/network/2022-11-01/virtualnetworkpeerings/predicates.go
@@ -12,19 +12,19 @@ type VirtualNetworkPeeringOperationPredicate struct {
 
 func (p VirtualNetworkPeeringOperationPredicate) Matches(input VirtualNetworkPeering) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/virtualnetworks/predicates.go b/resource-manager/network/2022-11-01/virtualnetworks/predicates.go
index 6b77860abe7..32421738de2 100644
--- a/resource-manager/network/2022-11-01/virtualnetworks/predicates.go
+++ b/resource-manager/network/2022-11-01/virtualnetworks/predicates.go
@@ -11,15 +11,15 @@ type PublicIPDdosProtectionStatusResultOperationPredicate struct {
 
 func (p PublicIPDdosProtectionStatusResultOperationPredicate) Matches(input PublicIPDdosProtectionStatusResult) bool {
 
-	if p.DdosProtectionPlanId != nil && (input.DdosProtectionPlanId == nil && *p.DdosProtectionPlanId != *input.DdosProtectionPlanId) {
+	if p.DdosProtectionPlanId != nil && (input.DdosProtectionPlanId == nil || *p.DdosProtectionPlanId != *input.DdosProtectionPlanId) {
 		return false
 	}
 
-	if p.PublicIPAddress != nil && (input.PublicIPAddress == nil && *p.PublicIPAddress != *input.PublicIPAddress) {
+	if p.PublicIPAddress != nil && (input.PublicIPAddress == nil || *p.PublicIPAddress != *input.PublicIPAddress) {
 		return false
 	}
 
-	if p.PublicIPAddressId != nil && (input.PublicIPAddressId == nil && *p.PublicIPAddressId != *input.PublicIPAddressId) {
+	if p.PublicIPAddressId != nil && (input.PublicIPAddressId == nil || *p.PublicIPAddressId != *input.PublicIPAddressId) {
 		return false
 	}
 
@@ -36,23 +36,23 @@ type VirtualNetworkOperationPredicate struct {
 
 func (p VirtualNetworkOperationPredicate) Matches(input VirtualNetwork) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -68,19 +68,19 @@ type VirtualNetworkUsageOperationPredicate struct {
 
 func (p VirtualNetworkUsageOperationPredicate) Matches(input VirtualNetworkUsage) bool {
 
-	if p.CurrentValue != nil && (input.CurrentValue == nil && *p.CurrentValue != *input.CurrentValue) {
+	if p.CurrentValue != nil && (input.CurrentValue == nil || *p.CurrentValue != *input.CurrentValue) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
-	if p.Unit != nil && (input.Unit == nil && *p.Unit != *input.Unit) {
+	if p.Unit != nil && (input.Unit == nil || *p.Unit != *input.Unit) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/virtualnetworktaps/predicates.go b/resource-manager/network/2022-11-01/virtualnetworktaps/predicates.go
index 73162940ff1..0b7fb5985f4 100644
--- a/resource-manager/network/2022-11-01/virtualnetworktaps/predicates.go
+++ b/resource-manager/network/2022-11-01/virtualnetworktaps/predicates.go
@@ -13,23 +13,23 @@ type VirtualNetworkTapOperationPredicate struct {
 
 func (p VirtualNetworkTapOperationPredicate) Matches(input VirtualNetworkTap) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/virtualrouterpeerings/predicates.go b/resource-manager/network/2022-11-01/virtualrouterpeerings/predicates.go
index df3a5e39161..1e181881675 100644
--- a/resource-manager/network/2022-11-01/virtualrouterpeerings/predicates.go
+++ b/resource-manager/network/2022-11-01/virtualrouterpeerings/predicates.go
@@ -12,19 +12,19 @@ type VirtualRouterPeeringOperationPredicate struct {
 
 func (p VirtualRouterPeeringOperationPredicate) Matches(input VirtualRouterPeering) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/virtualrouters/predicates.go b/resource-manager/network/2022-11-01/virtualrouters/predicates.go
index 8533ca9181c..676ee423641 100644
--- a/resource-manager/network/2022-11-01/virtualrouters/predicates.go
+++ b/resource-manager/network/2022-11-01/virtualrouters/predicates.go
@@ -13,23 +13,23 @@ type VirtualRouterOperationPredicate struct {
 
 func (p VirtualRouterOperationPredicate) Matches(input VirtualRouter) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/virtualwans/predicates.go b/resource-manager/network/2022-11-01/virtualwans/predicates.go
index c39b54e4c7b..3eba8222dcf 100644
--- a/resource-manager/network/2022-11-01/virtualwans/predicates.go
+++ b/resource-manager/network/2022-11-01/virtualwans/predicates.go
@@ -12,19 +12,19 @@ type BgpConnectionOperationPredicate struct {
 
 func (p BgpConnectionOperationPredicate) Matches(input BgpConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,19 +40,19 @@ type HubIPConfigurationOperationPredicate struct {
 
 func (p HubIPConfigurationOperationPredicate) Matches(input HubIPConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -68,19 +68,19 @@ type HubRouteTableOperationPredicate struct {
 
 func (p HubRouteTableOperationPredicate) Matches(input HubRouteTable) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -95,15 +95,15 @@ type HubVirtualNetworkConnectionOperationPredicate struct {
 
 func (p HubVirtualNetworkConnectionOperationPredicate) Matches(input HubVirtualNetworkConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
@@ -117,11 +117,11 @@ type NetworkVirtualApplianceConnectionOperationPredicate struct {
 
 func (p NetworkVirtualApplianceConnectionOperationPredicate) Matches(input NetworkVirtualApplianceConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
@@ -138,11 +138,11 @@ type P2SVpnGatewayOperationPredicate struct {
 
 func (p P2SVpnGatewayOperationPredicate) Matches(input P2SVpnGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -150,11 +150,11 @@ func (p P2SVpnGatewayOperationPredicate) Matches(input P2SVpnGateway) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -170,19 +170,19 @@ type RouteMapOperationPredicate struct {
 
 func (p RouteMapOperationPredicate) Matches(input RouteMap) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -198,19 +198,19 @@ type RoutingIntentOperationPredicate struct {
 
 func (p RoutingIntentOperationPredicate) Matches(input RoutingIntent) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -228,15 +228,15 @@ type VirtualHubOperationPredicate struct {
 
 func (p VirtualHubOperationPredicate) Matches(input VirtualHub) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -244,11 +244,11 @@ func (p VirtualHubOperationPredicate) Matches(input VirtualHub) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -263,15 +263,15 @@ type VirtualHubRouteTableV2OperationPredicate struct {
 
 func (p VirtualHubRouteTableV2OperationPredicate) Matches(input VirtualHubRouteTableV2) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
@@ -288,11 +288,11 @@ type VirtualWANOperationPredicate struct {
 
 func (p VirtualWANOperationPredicate) Matches(input VirtualWAN) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -300,11 +300,11 @@ func (p VirtualWANOperationPredicate) Matches(input VirtualWAN) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -319,15 +319,15 @@ type VpnConnectionOperationPredicate struct {
 
 func (p VpnConnectionOperationPredicate) Matches(input VpnConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
@@ -344,11 +344,11 @@ type VpnGatewayOperationPredicate struct {
 
 func (p VpnGatewayOperationPredicate) Matches(input VpnGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -356,11 +356,11 @@ func (p VpnGatewayOperationPredicate) Matches(input VpnGateway) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -376,19 +376,19 @@ type VpnGatewayNatRuleOperationPredicate struct {
 
 func (p VpnGatewayNatRuleOperationPredicate) Matches(input VpnGatewayNatRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -405,23 +405,23 @@ type VpnServerConfigurationOperationPredicate struct {
 
 func (p VpnServerConfigurationOperationPredicate) Matches(input VpnServerConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -437,19 +437,19 @@ type VpnServerConfigurationPolicyGroupOperationPredicate struct {
 
 func (p VpnServerConfigurationPolicyGroupOperationPredicate) Matches(input VpnServerConfigurationPolicyGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -466,11 +466,11 @@ type VpnSiteOperationPredicate struct {
 
 func (p VpnSiteOperationPredicate) Matches(input VpnSite) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -478,11 +478,11 @@ func (p VpnSiteOperationPredicate) Matches(input VpnSite) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -498,19 +498,19 @@ type VpnSiteLinkOperationPredicate struct {
 
 func (p VpnSiteLinkOperationPredicate) Matches(input VpnSiteLink) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -526,19 +526,19 @@ type VpnSiteLinkConnectionOperationPredicate struct {
 
 func (p VpnSiteLinkConnectionOperationPredicate) Matches(input VpnSiteLinkConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/vmsspublicipaddresses/predicates.go b/resource-manager/network/2022-11-01/vmsspublicipaddresses/predicates.go
index 2ba46e3bd91..3173ab41a32 100644
--- a/resource-manager/network/2022-11-01/vmsspublicipaddresses/predicates.go
+++ b/resource-manager/network/2022-11-01/vmsspublicipaddresses/predicates.go
@@ -13,23 +13,23 @@ type PublicIPAddressOperationPredicate struct {
 
 func (p PublicIPAddressOperationPredicate) Matches(input PublicIPAddress) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/webapplicationfirewallpolicies/predicates.go b/resource-manager/network/2022-11-01/webapplicationfirewallpolicies/predicates.go
index 9bdf8d1c8b6..a7973b0a14f 100644
--- a/resource-manager/network/2022-11-01/webapplicationfirewallpolicies/predicates.go
+++ b/resource-manager/network/2022-11-01/webapplicationfirewallpolicies/predicates.go
@@ -13,23 +13,23 @@ type WebApplicationFirewallPolicyOperationPredicate struct {
 
 func (p WebApplicationFirewallPolicyOperationPredicate) Matches(input WebApplicationFirewallPolicy) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2022-11-01/webcategories/predicates.go b/resource-manager/network/2022-11-01/webcategories/predicates.go
index 28bacd194ee..ab82b0c92b5 100644
--- a/resource-manager/network/2022-11-01/webcategories/predicates.go
+++ b/resource-manager/network/2022-11-01/webcategories/predicates.go
@@ -12,19 +12,19 @@ type AzureWebCategoryOperationPredicate struct {
 
 func (p AzureWebCategoryOperationPredicate) Matches(input AzureWebCategory) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/adminrulecollections/predicates.go b/resource-manager/network/2023-02-01/adminrulecollections/predicates.go
index 2f10067f017..67b37b95643 100644
--- a/resource-manager/network/2023-02-01/adminrulecollections/predicates.go
+++ b/resource-manager/network/2023-02-01/adminrulecollections/predicates.go
@@ -12,19 +12,19 @@ type AdminRuleCollectionOperationPredicate struct {
 
 func (p AdminRuleCollectionOperationPredicate) Matches(input AdminRuleCollection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/applicationgatewayprivateendpointconnections/predicates.go b/resource-manager/network/2023-02-01/applicationgatewayprivateendpointconnections/predicates.go
index ce7e107fd0d..46757c5239b 100644
--- a/resource-manager/network/2023-02-01/applicationgatewayprivateendpointconnections/predicates.go
+++ b/resource-manager/network/2023-02-01/applicationgatewayprivateendpointconnections/predicates.go
@@ -12,19 +12,19 @@ type ApplicationGatewayPrivateEndpointConnectionOperationPredicate struct {
 
 func (p ApplicationGatewayPrivateEndpointConnectionOperationPredicate) Matches(input ApplicationGatewayPrivateEndpointConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/applicationgatewayprivatelinkresources/predicates.go b/resource-manager/network/2023-02-01/applicationgatewayprivatelinkresources/predicates.go
index 717ca511a70..e93c21bb751 100644
--- a/resource-manager/network/2023-02-01/applicationgatewayprivatelinkresources/predicates.go
+++ b/resource-manager/network/2023-02-01/applicationgatewayprivatelinkresources/predicates.go
@@ -12,19 +12,19 @@ type ApplicationGatewayPrivateLinkResourceOperationPredicate struct {
 
 func (p ApplicationGatewayPrivateLinkResourceOperationPredicate) Matches(input ApplicationGatewayPrivateLinkResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/applicationgateways/predicates.go b/resource-manager/network/2023-02-01/applicationgateways/predicates.go
index ff35d27f30c..c51e6f7b000 100644
--- a/resource-manager/network/2023-02-01/applicationgateways/predicates.go
+++ b/resource-manager/network/2023-02-01/applicationgateways/predicates.go
@@ -13,23 +13,23 @@ type ApplicationGatewayOperationPredicate struct {
 
 func (p ApplicationGatewayOperationPredicate) Matches(input ApplicationGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -43,11 +43,11 @@ type ApplicationGatewaySslPredefinedPolicyOperationPredicate struct {
 
 func (p ApplicationGatewaySslPredefinedPolicyOperationPredicate) Matches(input ApplicationGatewaySslPredefinedPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/applicationgatewaywafdynamicmanifests/predicates.go b/resource-manager/network/2023-02-01/applicationgatewaywafdynamicmanifests/predicates.go
index 71fb8558fc1..9714d21637e 100644
--- a/resource-manager/network/2023-02-01/applicationgatewaywafdynamicmanifests/predicates.go
+++ b/resource-manager/network/2023-02-01/applicationgatewaywafdynamicmanifests/predicates.go
@@ -11,15 +11,15 @@ type ApplicationGatewayWafDynamicManifestResultOperationPredicate struct {
 
 func (p ApplicationGatewayWafDynamicManifestResultOperationPredicate) Matches(input ApplicationGatewayWafDynamicManifestResult) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/applicationsecuritygroups/predicates.go b/resource-manager/network/2023-02-01/applicationsecuritygroups/predicates.go
index bb7f348a2a4..6ea534ecd89 100644
--- a/resource-manager/network/2023-02-01/applicationsecuritygroups/predicates.go
+++ b/resource-manager/network/2023-02-01/applicationsecuritygroups/predicates.go
@@ -13,23 +13,23 @@ type ApplicationSecurityGroupOperationPredicate struct {
 
 func (p ApplicationSecurityGroupOperationPredicate) Matches(input ApplicationSecurityGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/availabledelegations/predicates.go b/resource-manager/network/2023-02-01/availabledelegations/predicates.go
index ed867e9cb60..caf6b904077 100644
--- a/resource-manager/network/2023-02-01/availabledelegations/predicates.go
+++ b/resource-manager/network/2023-02-01/availabledelegations/predicates.go
@@ -12,19 +12,19 @@ type AvailableDelegationOperationPredicate struct {
 
 func (p AvailableDelegationOperationPredicate) Matches(input AvailableDelegation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ServiceName != nil && (input.ServiceName == nil && *p.ServiceName != *input.ServiceName) {
+	if p.ServiceName != nil && (input.ServiceName == nil || *p.ServiceName != *input.ServiceName) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/availableservicealiases/predicates.go b/resource-manager/network/2023-02-01/availableservicealiases/predicates.go
index 9949a5723d5..afe2abff9ab 100644
--- a/resource-manager/network/2023-02-01/availableservicealiases/predicates.go
+++ b/resource-manager/network/2023-02-01/availableservicealiases/predicates.go
@@ -12,19 +12,19 @@ type AvailableServiceAliasOperationPredicate struct {
 
 func (p AvailableServiceAliasOperationPredicate) Matches(input AvailableServiceAlias) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceName != nil && (input.ResourceName == nil && *p.ResourceName != *input.ResourceName) {
+	if p.ResourceName != nil && (input.ResourceName == nil || *p.ResourceName != *input.ResourceName) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/azurefirewalls/predicates.go b/resource-manager/network/2023-02-01/azurefirewalls/predicates.go
index eef0c0724f3..68ca8da5623 100644
--- a/resource-manager/network/2023-02-01/azurefirewalls/predicates.go
+++ b/resource-manager/network/2023-02-01/azurefirewalls/predicates.go
@@ -13,23 +13,23 @@ type AzureFirewallOperationPredicate struct {
 
 func (p AzureFirewallOperationPredicate) Matches(input AzureFirewall) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/bastionhosts/predicates.go b/resource-manager/network/2023-02-01/bastionhosts/predicates.go
index a5e3edd0204..3c3835a32d0 100644
--- a/resource-manager/network/2023-02-01/bastionhosts/predicates.go
+++ b/resource-manager/network/2023-02-01/bastionhosts/predicates.go
@@ -18,43 +18,43 @@ type BastionActiveSessionOperationPredicate struct {
 
 func (p BastionActiveSessionOperationPredicate) Matches(input BastionActiveSession) bool {
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
-	if p.SessionDurationInMins != nil && (input.SessionDurationInMins == nil && *p.SessionDurationInMins != *input.SessionDurationInMins) {
+	if p.SessionDurationInMins != nil && (input.SessionDurationInMins == nil || *p.SessionDurationInMins != *input.SessionDurationInMins) {
 		return false
 	}
 
-	if p.SessionId != nil && (input.SessionId == nil && *p.SessionId != *input.SessionId) {
+	if p.SessionId != nil && (input.SessionId == nil || *p.SessionId != *input.SessionId) {
 		return false
 	}
 
-	if p.StartTime != nil && (input.StartTime == nil && *p.StartTime != *input.StartTime) {
+	if p.StartTime != nil && (input.StartTime == nil || *p.StartTime != *input.StartTime) {
 		return false
 	}
 
-	if p.TargetHostName != nil && (input.TargetHostName == nil && *p.TargetHostName != *input.TargetHostName) {
+	if p.TargetHostName != nil && (input.TargetHostName == nil || *p.TargetHostName != *input.TargetHostName) {
 		return false
 	}
 
-	if p.TargetIPAddress != nil && (input.TargetIPAddress == nil && *p.TargetIPAddress != *input.TargetIPAddress) {
+	if p.TargetIPAddress != nil && (input.TargetIPAddress == nil || *p.TargetIPAddress != *input.TargetIPAddress) {
 		return false
 	}
 
-	if p.TargetResourceGroup != nil && (input.TargetResourceGroup == nil && *p.TargetResourceGroup != *input.TargetResourceGroup) {
+	if p.TargetResourceGroup != nil && (input.TargetResourceGroup == nil || *p.TargetResourceGroup != *input.TargetResourceGroup) {
 		return false
 	}
 
-	if p.TargetResourceId != nil && (input.TargetResourceId == nil && *p.TargetResourceId != *input.TargetResourceId) {
+	if p.TargetResourceId != nil && (input.TargetResourceId == nil || *p.TargetResourceId != *input.TargetResourceId) {
 		return false
 	}
 
-	if p.TargetSubscriptionId != nil && (input.TargetSubscriptionId == nil && *p.TargetSubscriptionId != *input.TargetSubscriptionId) {
+	if p.TargetSubscriptionId != nil && (input.TargetSubscriptionId == nil || *p.TargetSubscriptionId != *input.TargetSubscriptionId) {
 		return false
 	}
 
-	if p.UserName != nil && (input.UserName == nil && *p.UserName != *input.UserName) {
+	if p.UserName != nil && (input.UserName == nil || *p.UserName != *input.UserName) {
 		return false
 	}
 
@@ -71,23 +71,23 @@ type BastionHostOperationPredicate struct {
 
 func (p BastionHostOperationPredicate) Matches(input BastionHost) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -102,15 +102,15 @@ type BastionSessionStateOperationPredicate struct {
 
 func (p BastionSessionStateOperationPredicate) Matches(input BastionSessionState) bool {
 
-	if p.Message != nil && (input.Message == nil && *p.Message != *input.Message) {
+	if p.Message != nil && (input.Message == nil || *p.Message != *input.Message) {
 		return false
 	}
 
-	if p.SessionId != nil && (input.SessionId == nil && *p.SessionId != *input.SessionId) {
+	if p.SessionId != nil && (input.SessionId == nil || *p.SessionId != *input.SessionId) {
 		return false
 	}
 
-	if p.State != nil && (input.State == nil && *p.State != *input.State) {
+	if p.State != nil && (input.State == nil || *p.State != *input.State) {
 		return false
 	}
 
@@ -125,15 +125,15 @@ type BastionShareableLinkOperationPredicate struct {
 
 func (p BastionShareableLinkOperationPredicate) Matches(input BastionShareableLink) bool {
 
-	if p.Bsl != nil && (input.Bsl == nil && *p.Bsl != *input.Bsl) {
+	if p.Bsl != nil && (input.Bsl == nil || *p.Bsl != *input.Bsl) {
 		return false
 	}
 
-	if p.CreatedAt != nil && (input.CreatedAt == nil && *p.CreatedAt != *input.CreatedAt) {
+	if p.CreatedAt != nil && (input.CreatedAt == nil || *p.CreatedAt != *input.CreatedAt) {
 		return false
 	}
 
-	if p.Message != nil && (input.Message == nil && *p.Message != *input.Message) {
+	if p.Message != nil && (input.Message == nil || *p.Message != *input.Message) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/bastionshareablelink/predicates.go b/resource-manager/network/2023-02-01/bastionshareablelink/predicates.go
index ce72bc40681..15f07095262 100644
--- a/resource-manager/network/2023-02-01/bastionshareablelink/predicates.go
+++ b/resource-manager/network/2023-02-01/bastionshareablelink/predicates.go
@@ -11,15 +11,15 @@ type BastionShareableLinkOperationPredicate struct {
 
 func (p BastionShareableLinkOperationPredicate) Matches(input BastionShareableLink) bool {
 
-	if p.Bsl != nil && (input.Bsl == nil && *p.Bsl != *input.Bsl) {
+	if p.Bsl != nil && (input.Bsl == nil || *p.Bsl != *input.Bsl) {
 		return false
 	}
 
-	if p.CreatedAt != nil && (input.CreatedAt == nil && *p.CreatedAt != *input.CreatedAt) {
+	if p.CreatedAt != nil && (input.CreatedAt == nil || *p.CreatedAt != *input.CreatedAt) {
 		return false
 	}
 
-	if p.Message != nil && (input.Message == nil && *p.Message != *input.Message) {
+	if p.Message != nil && (input.Message == nil || *p.Message != *input.Message) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/bgpservicecommunities/predicates.go b/resource-manager/network/2023-02-01/bgpservicecommunities/predicates.go
index ae5019b967b..2e90f55ae55 100644
--- a/resource-manager/network/2023-02-01/bgpservicecommunities/predicates.go
+++ b/resource-manager/network/2023-02-01/bgpservicecommunities/predicates.go
@@ -12,19 +12,19 @@ type BgpServiceCommunityOperationPredicate struct {
 
 func (p BgpServiceCommunityOperationPredicate) Matches(input BgpServiceCommunity) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/cloudservicepublicipaddresses/predicates.go b/resource-manager/network/2023-02-01/cloudservicepublicipaddresses/predicates.go
index 0c1aab1e694..f27f03144ee 100644
--- a/resource-manager/network/2023-02-01/cloudservicepublicipaddresses/predicates.go
+++ b/resource-manager/network/2023-02-01/cloudservicepublicipaddresses/predicates.go
@@ -13,23 +13,23 @@ type PublicIPAddressOperationPredicate struct {
 
 func (p PublicIPAddressOperationPredicate) Matches(input PublicIPAddress) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/connectivityconfigurations/predicates.go b/resource-manager/network/2023-02-01/connectivityconfigurations/predicates.go
index a581c573c65..ecab73247f2 100644
--- a/resource-manager/network/2023-02-01/connectivityconfigurations/predicates.go
+++ b/resource-manager/network/2023-02-01/connectivityconfigurations/predicates.go
@@ -12,19 +12,19 @@ type ConnectivityConfigurationOperationPredicate struct {
 
 func (p ConnectivityConfigurationOperationPredicate) Matches(input ConnectivityConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/customipprefixes/predicates.go b/resource-manager/network/2023-02-01/customipprefixes/predicates.go
index a7d5ffe920a..288f9cfa042 100644
--- a/resource-manager/network/2023-02-01/customipprefixes/predicates.go
+++ b/resource-manager/network/2023-02-01/customipprefixes/predicates.go
@@ -13,23 +13,23 @@ type CustomIPPrefixOperationPredicate struct {
 
 func (p CustomIPPrefixOperationPredicate) Matches(input CustomIPPrefix) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/ddosprotectionplans/predicates.go b/resource-manager/network/2023-02-01/ddosprotectionplans/predicates.go
index f0bd539d370..6ad9bbf5374 100644
--- a/resource-manager/network/2023-02-01/ddosprotectionplans/predicates.go
+++ b/resource-manager/network/2023-02-01/ddosprotectionplans/predicates.go
@@ -13,23 +13,23 @@ type DdosProtectionPlanOperationPredicate struct {
 
 func (p DdosProtectionPlanOperationPredicate) Matches(input DdosProtectionPlan) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/dscpconfigurations/predicates.go b/resource-manager/network/2023-02-01/dscpconfigurations/predicates.go
index 2281e144720..7628df6beb6 100644
--- a/resource-manager/network/2023-02-01/dscpconfigurations/predicates.go
+++ b/resource-manager/network/2023-02-01/dscpconfigurations/predicates.go
@@ -13,23 +13,23 @@ type DscpConfigurationOperationPredicate struct {
 
 func (p DscpConfigurationOperationPredicate) Matches(input DscpConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/endpointservices/predicates.go b/resource-manager/network/2023-02-01/endpointservices/predicates.go
index 1e48205c952..9a5ec06a288 100644
--- a/resource-manager/network/2023-02-01/endpointservices/predicates.go
+++ b/resource-manager/network/2023-02-01/endpointservices/predicates.go
@@ -11,15 +11,15 @@ type EndpointServiceResultOperationPredicate struct {
 
 func (p EndpointServiceResultOperationPredicate) Matches(input EndpointServiceResult) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/expressroutecircuitauthorizations/predicates.go b/resource-manager/network/2023-02-01/expressroutecircuitauthorizations/predicates.go
index 4a3d75102ac..3533e80a13e 100644
--- a/resource-manager/network/2023-02-01/expressroutecircuitauthorizations/predicates.go
+++ b/resource-manager/network/2023-02-01/expressroutecircuitauthorizations/predicates.go
@@ -12,19 +12,19 @@ type ExpressRouteCircuitAuthorizationOperationPredicate struct {
 
 func (p ExpressRouteCircuitAuthorizationOperationPredicate) Matches(input ExpressRouteCircuitAuthorization) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/expressroutecircuitconnections/predicates.go b/resource-manager/network/2023-02-01/expressroutecircuitconnections/predicates.go
index 697aab56df9..6c65b4df05d 100644
--- a/resource-manager/network/2023-02-01/expressroutecircuitconnections/predicates.go
+++ b/resource-manager/network/2023-02-01/expressroutecircuitconnections/predicates.go
@@ -12,19 +12,19 @@ type ExpressRouteCircuitConnectionOperationPredicate struct {
 
 func (p ExpressRouteCircuitConnectionOperationPredicate) Matches(input ExpressRouteCircuitConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/expressroutecircuitpeerings/predicates.go b/resource-manager/network/2023-02-01/expressroutecircuitpeerings/predicates.go
index 8b3551606e8..1e725c4e63a 100644
--- a/resource-manager/network/2023-02-01/expressroutecircuitpeerings/predicates.go
+++ b/resource-manager/network/2023-02-01/expressroutecircuitpeerings/predicates.go
@@ -12,19 +12,19 @@ type ExpressRouteCircuitPeeringOperationPredicate struct {
 
 func (p ExpressRouteCircuitPeeringOperationPredicate) Matches(input ExpressRouteCircuitPeering) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/expressroutecircuits/predicates.go b/resource-manager/network/2023-02-01/expressroutecircuits/predicates.go
index c0013d9656e..3fdbc040dbf 100644
--- a/resource-manager/network/2023-02-01/expressroutecircuits/predicates.go
+++ b/resource-manager/network/2023-02-01/expressroutecircuits/predicates.go
@@ -13,23 +13,23 @@ type ExpressRouteCircuitOperationPredicate struct {
 
 func (p ExpressRouteCircuitOperationPredicate) Matches(input ExpressRouteCircuit) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/expressroutecrossconnectionpeerings/predicates.go b/resource-manager/network/2023-02-01/expressroutecrossconnectionpeerings/predicates.go
index a21509eb010..abec5984ec1 100644
--- a/resource-manager/network/2023-02-01/expressroutecrossconnectionpeerings/predicates.go
+++ b/resource-manager/network/2023-02-01/expressroutecrossconnectionpeerings/predicates.go
@@ -11,15 +11,15 @@ type ExpressRouteCrossConnectionPeeringOperationPredicate struct {
 
 func (p ExpressRouteCrossConnectionPeeringOperationPredicate) Matches(input ExpressRouteCrossConnectionPeering) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/expressroutecrossconnections/predicates.go b/resource-manager/network/2023-02-01/expressroutecrossconnections/predicates.go
index 2b30277eb5d..f3d9b3a8dff 100644
--- a/resource-manager/network/2023-02-01/expressroutecrossconnections/predicates.go
+++ b/resource-manager/network/2023-02-01/expressroutecrossconnections/predicates.go
@@ -13,23 +13,23 @@ type ExpressRouteCrossConnectionOperationPredicate struct {
 
 func (p ExpressRouteCrossConnectionOperationPredicate) Matches(input ExpressRouteCrossConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/expressroutelinks/predicates.go b/resource-manager/network/2023-02-01/expressroutelinks/predicates.go
index c5955ad29e5..bd6127afc55 100644
--- a/resource-manager/network/2023-02-01/expressroutelinks/predicates.go
+++ b/resource-manager/network/2023-02-01/expressroutelinks/predicates.go
@@ -11,15 +11,15 @@ type ExpressRouteLinkOperationPredicate struct {
 
 func (p ExpressRouteLinkOperationPredicate) Matches(input ExpressRouteLink) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/expressrouteportauthorizations/predicates.go b/resource-manager/network/2023-02-01/expressrouteportauthorizations/predicates.go
index 2cdc970dad0..d12fc29e52a 100644
--- a/resource-manager/network/2023-02-01/expressrouteportauthorizations/predicates.go
+++ b/resource-manager/network/2023-02-01/expressrouteportauthorizations/predicates.go
@@ -12,19 +12,19 @@ type ExpressRoutePortAuthorizationOperationPredicate struct {
 
 func (p ExpressRoutePortAuthorizationOperationPredicate) Matches(input ExpressRoutePortAuthorization) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/expressrouteports/predicates.go b/resource-manager/network/2023-02-01/expressrouteports/predicates.go
index 26d4591a65f..7339fac991b 100644
--- a/resource-manager/network/2023-02-01/expressrouteports/predicates.go
+++ b/resource-manager/network/2023-02-01/expressrouteports/predicates.go
@@ -13,23 +13,23 @@ type ExpressRoutePortOperationPredicate struct {
 
 func (p ExpressRoutePortOperationPredicate) Matches(input ExpressRoutePort) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/expressrouteportslocations/predicates.go b/resource-manager/network/2023-02-01/expressrouteportslocations/predicates.go
index 43649ada37d..3b345c2e1f5 100644
--- a/resource-manager/network/2023-02-01/expressrouteportslocations/predicates.go
+++ b/resource-manager/network/2023-02-01/expressrouteportslocations/predicates.go
@@ -12,19 +12,19 @@ type ExpressRoutePortsLocationOperationPredicate struct {
 
 func (p ExpressRoutePortsLocationOperationPredicate) Matches(input ExpressRoutePortsLocation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/expressrouteserviceproviders/predicates.go b/resource-manager/network/2023-02-01/expressrouteserviceproviders/predicates.go
index baa5b8aba7a..d2c605983d7 100644
--- a/resource-manager/network/2023-02-01/expressrouteserviceproviders/predicates.go
+++ b/resource-manager/network/2023-02-01/expressrouteserviceproviders/predicates.go
@@ -12,19 +12,19 @@ type ExpressRouteServiceProviderOperationPredicate struct {
 
 func (p ExpressRouteServiceProviderOperationPredicate) Matches(input ExpressRouteServiceProvider) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/firewallpolicies/predicates.go b/resource-manager/network/2023-02-01/firewallpolicies/predicates.go
index b95e12c63e2..2640042ba7a 100644
--- a/resource-manager/network/2023-02-01/firewallpolicies/predicates.go
+++ b/resource-manager/network/2023-02-01/firewallpolicies/predicates.go
@@ -13,23 +13,23 @@ type FirewallPolicyOperationPredicate struct {
 
 func (p FirewallPolicyOperationPredicate) Matches(input FirewallPolicy) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/firewallpolicyrulecollectiongroups/predicates.go b/resource-manager/network/2023-02-01/firewallpolicyrulecollectiongroups/predicates.go
index c190891d1a1..9762acada56 100644
--- a/resource-manager/network/2023-02-01/firewallpolicyrulecollectiongroups/predicates.go
+++ b/resource-manager/network/2023-02-01/firewallpolicyrulecollectiongroups/predicates.go
@@ -12,19 +12,19 @@ type FirewallPolicyRuleCollectionGroupOperationPredicate struct {
 
 func (p FirewallPolicyRuleCollectionGroupOperationPredicate) Matches(input FirewallPolicyRuleCollectionGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/flowlogs/predicates.go b/resource-manager/network/2023-02-01/flowlogs/predicates.go
index 1aa47092e55..746df2611cc 100644
--- a/resource-manager/network/2023-02-01/flowlogs/predicates.go
+++ b/resource-manager/network/2023-02-01/flowlogs/predicates.go
@@ -13,23 +13,23 @@ type FlowLogOperationPredicate struct {
 
 func (p FlowLogOperationPredicate) Matches(input FlowLog) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/ipallocations/predicates.go b/resource-manager/network/2023-02-01/ipallocations/predicates.go
index 866a19a7190..5f4e136ae66 100644
--- a/resource-manager/network/2023-02-01/ipallocations/predicates.go
+++ b/resource-manager/network/2023-02-01/ipallocations/predicates.go
@@ -13,23 +13,23 @@ type IPAllocationOperationPredicate struct {
 
 func (p IPAllocationOperationPredicate) Matches(input IPAllocation) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/ipgroups/predicates.go b/resource-manager/network/2023-02-01/ipgroups/predicates.go
index 705b10e2ed0..a64e98c2290 100644
--- a/resource-manager/network/2023-02-01/ipgroups/predicates.go
+++ b/resource-manager/network/2023-02-01/ipgroups/predicates.go
@@ -13,23 +13,23 @@ type IPGroupOperationPredicate struct {
 
 func (p IPGroupOperationPredicate) Matches(input IPGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/loadbalancers/predicates.go b/resource-manager/network/2023-02-01/loadbalancers/predicates.go
index b5cc68245b6..82f247704c6 100644
--- a/resource-manager/network/2023-02-01/loadbalancers/predicates.go
+++ b/resource-manager/network/2023-02-01/loadbalancers/predicates.go
@@ -12,19 +12,19 @@ type BackendAddressPoolOperationPredicate struct {
 
 func (p BackendAddressPoolOperationPredicate) Matches(input BackendAddressPool) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,19 +40,19 @@ type FrontendIPConfigurationOperationPredicate struct {
 
 func (p FrontendIPConfigurationOperationPredicate) Matches(input FrontendIPConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -68,19 +68,19 @@ type InboundNatRuleOperationPredicate struct {
 
 func (p InboundNatRuleOperationPredicate) Matches(input InboundNatRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -97,23 +97,23 @@ type LoadBalancerOperationPredicate struct {
 
 func (p LoadBalancerOperationPredicate) Matches(input LoadBalancer) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -129,19 +129,19 @@ type LoadBalancingRuleOperationPredicate struct {
 
 func (p LoadBalancingRuleOperationPredicate) Matches(input LoadBalancingRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -158,23 +158,23 @@ type NetworkInterfaceOperationPredicate struct {
 
 func (p NetworkInterfaceOperationPredicate) Matches(input NetworkInterface) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -190,19 +190,19 @@ type OutboundRuleOperationPredicate struct {
 
 func (p OutboundRuleOperationPredicate) Matches(input OutboundRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -218,19 +218,19 @@ type ProbeOperationPredicate struct {
 
 func (p ProbeOperationPredicate) Matches(input Probe) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/localnetworkgateways/predicates.go b/resource-manager/network/2023-02-01/localnetworkgateways/predicates.go
index 462c9037886..d4e529f8a9c 100644
--- a/resource-manager/network/2023-02-01/localnetworkgateways/predicates.go
+++ b/resource-manager/network/2023-02-01/localnetworkgateways/predicates.go
@@ -13,23 +13,23 @@ type LocalNetworkGatewayOperationPredicate struct {
 
 func (p LocalNetworkGatewayOperationPredicate) Matches(input LocalNetworkGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/natgateways/predicates.go b/resource-manager/network/2023-02-01/natgateways/predicates.go
index d5cfb6b66fc..c0e09cf2f07 100644
--- a/resource-manager/network/2023-02-01/natgateways/predicates.go
+++ b/resource-manager/network/2023-02-01/natgateways/predicates.go
@@ -13,23 +13,23 @@ type NatGatewayOperationPredicate struct {
 
 func (p NatGatewayOperationPredicate) Matches(input NatGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/networkgroups/predicates.go b/resource-manager/network/2023-02-01/networkgroups/predicates.go
index d38c9efbbfc..621d0d7b40a 100644
--- a/resource-manager/network/2023-02-01/networkgroups/predicates.go
+++ b/resource-manager/network/2023-02-01/networkgroups/predicates.go
@@ -12,19 +12,19 @@ type NetworkGroupOperationPredicate struct {
 
 func (p NetworkGroupOperationPredicate) Matches(input NetworkGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/networkinterfaces/predicates.go b/resource-manager/network/2023-02-01/networkinterfaces/predicates.go
index 941725ff11e..1bdf1a16800 100644
--- a/resource-manager/network/2023-02-01/networkinterfaces/predicates.go
+++ b/resource-manager/network/2023-02-01/networkinterfaces/predicates.go
@@ -13,23 +13,23 @@ type LoadBalancerOperationPredicate struct {
 
 func (p LoadBalancerOperationPredicate) Matches(input LoadBalancer) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -46,23 +46,23 @@ type NetworkInterfaceOperationPredicate struct {
 
 func (p NetworkInterfaceOperationPredicate) Matches(input NetworkInterface) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -78,19 +78,19 @@ type NetworkInterfaceIPConfigurationOperationPredicate struct {
 
 func (p NetworkInterfaceIPConfigurationOperationPredicate) Matches(input NetworkInterfaceIPConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -106,19 +106,19 @@ type NetworkInterfaceTapConfigurationOperationPredicate struct {
 
 func (p NetworkInterfaceTapConfigurationOperationPredicate) Matches(input NetworkInterfaceTapConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/networkmanagerconnections/predicates.go b/resource-manager/network/2023-02-01/networkmanagerconnections/predicates.go
index a4d1d456e2e..145b7b7261a 100644
--- a/resource-manager/network/2023-02-01/networkmanagerconnections/predicates.go
+++ b/resource-manager/network/2023-02-01/networkmanagerconnections/predicates.go
@@ -12,19 +12,19 @@ type NetworkManagerConnectionOperationPredicate struct {
 
 func (p NetworkManagerConnectionOperationPredicate) Matches(input NetworkManagerConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/networkmanagers/predicates.go b/resource-manager/network/2023-02-01/networkmanagers/predicates.go
index fee18f9eea0..7c1597c2666 100644
--- a/resource-manager/network/2023-02-01/networkmanagers/predicates.go
+++ b/resource-manager/network/2023-02-01/networkmanagers/predicates.go
@@ -13,23 +13,23 @@ type NetworkManagerOperationPredicate struct {
 
 func (p NetworkManagerOperationPredicate) Matches(input NetworkManager) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/networkprofiles/predicates.go b/resource-manager/network/2023-02-01/networkprofiles/predicates.go
index c1ae5ce4c79..c8b72ff46b2 100644
--- a/resource-manager/network/2023-02-01/networkprofiles/predicates.go
+++ b/resource-manager/network/2023-02-01/networkprofiles/predicates.go
@@ -13,23 +13,23 @@ type NetworkProfileOperationPredicate struct {
 
 func (p NetworkProfileOperationPredicate) Matches(input NetworkProfile) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/networksecuritygroups/predicates.go b/resource-manager/network/2023-02-01/networksecuritygroups/predicates.go
index 156bd00cd3d..b9f6d3f3df5 100644
--- a/resource-manager/network/2023-02-01/networksecuritygroups/predicates.go
+++ b/resource-manager/network/2023-02-01/networksecuritygroups/predicates.go
@@ -13,23 +13,23 @@ type NetworkSecurityGroupOperationPredicate struct {
 
 func (p NetworkSecurityGroupOperationPredicate) Matches(input NetworkSecurityGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/networkvirtualappliances/predicates.go b/resource-manager/network/2023-02-01/networkvirtualappliances/predicates.go
index d9e9dfa93ea..676b2af6c25 100644
--- a/resource-manager/network/2023-02-01/networkvirtualappliances/predicates.go
+++ b/resource-manager/network/2023-02-01/networkvirtualappliances/predicates.go
@@ -13,23 +13,23 @@ type NetworkVirtualApplianceOperationPredicate struct {
 
 func (p NetworkVirtualApplianceOperationPredicate) Matches(input NetworkVirtualAppliance) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/peerexpressroutecircuitconnections/predicates.go b/resource-manager/network/2023-02-01/peerexpressroutecircuitconnections/predicates.go
index 967ae9d3147..c0766bb2d18 100644
--- a/resource-manager/network/2023-02-01/peerexpressroutecircuitconnections/predicates.go
+++ b/resource-manager/network/2023-02-01/peerexpressroutecircuitconnections/predicates.go
@@ -12,19 +12,19 @@ type PeerExpressRouteCircuitConnectionOperationPredicate struct {
 
 func (p PeerExpressRouteCircuitConnectionOperationPredicate) Matches(input PeerExpressRouteCircuitConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/privatednszonegroups/predicates.go b/resource-manager/network/2023-02-01/privatednszonegroups/predicates.go
index f77b300cd94..4d27803d6e2 100644
--- a/resource-manager/network/2023-02-01/privatednszonegroups/predicates.go
+++ b/resource-manager/network/2023-02-01/privatednszonegroups/predicates.go
@@ -11,15 +11,15 @@ type PrivateDnsZoneGroupOperationPredicate struct {
 
 func (p PrivateDnsZoneGroupOperationPredicate) Matches(input PrivateDnsZoneGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/privateendpoints/predicates.go b/resource-manager/network/2023-02-01/privateendpoints/predicates.go
index c2c9137a231..c99098d0163 100644
--- a/resource-manager/network/2023-02-01/privateendpoints/predicates.go
+++ b/resource-manager/network/2023-02-01/privateendpoints/predicates.go
@@ -13,23 +13,23 @@ type AvailablePrivateEndpointTypeOperationPredicate struct {
 
 func (p AvailablePrivateEndpointTypeOperationPredicate) Matches(input AvailablePrivateEndpointType) bool {
 
-	if p.DisplayName != nil && (input.DisplayName == nil && *p.DisplayName != *input.DisplayName) {
+	if p.DisplayName != nil && (input.DisplayName == nil || *p.DisplayName != *input.DisplayName) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceName != nil && (input.ResourceName == nil && *p.ResourceName != *input.ResourceName) {
+	if p.ResourceName != nil && (input.ResourceName == nil || *p.ResourceName != *input.ResourceName) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -46,23 +46,23 @@ type PrivateEndpointOperationPredicate struct {
 
 func (p PrivateEndpointOperationPredicate) Matches(input PrivateEndpoint) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/privatelinkservices/predicates.go b/resource-manager/network/2023-02-01/privatelinkservices/predicates.go
index 44963c73ff0..f7e18f9feee 100644
--- a/resource-manager/network/2023-02-01/privatelinkservices/predicates.go
+++ b/resource-manager/network/2023-02-01/privatelinkservices/predicates.go
@@ -9,7 +9,7 @@ type AutoApprovedPrivateLinkServiceOperationPredicate struct {
 
 func (p AutoApprovedPrivateLinkServiceOperationPredicate) Matches(input AutoApprovedPrivateLinkService) bool {
 
-	if p.PrivateLinkService != nil && (input.PrivateLinkService == nil && *p.PrivateLinkService != *input.PrivateLinkService) {
+	if p.PrivateLinkService != nil && (input.PrivateLinkService == nil || *p.PrivateLinkService != *input.PrivateLinkService) {
 		return false
 	}
 
@@ -25,19 +25,19 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -54,23 +54,23 @@ type PrivateLinkServiceOperationPredicate struct {
 
 func (p PrivateLinkServiceOperationPredicate) Matches(input PrivateLinkService) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/publicipaddresses/predicates.go b/resource-manager/network/2023-02-01/publicipaddresses/predicates.go
index 9d8f3f36a5b..07d29ffa733 100644
--- a/resource-manager/network/2023-02-01/publicipaddresses/predicates.go
+++ b/resource-manager/network/2023-02-01/publicipaddresses/predicates.go
@@ -13,23 +13,23 @@ type PublicIPAddressOperationPredicate struct {
 
 func (p PublicIPAddressOperationPredicate) Matches(input PublicIPAddress) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/publicipprefixes/predicates.go b/resource-manager/network/2023-02-01/publicipprefixes/predicates.go
index 26580cf1658..7deb3ca2bbf 100644
--- a/resource-manager/network/2023-02-01/publicipprefixes/predicates.go
+++ b/resource-manager/network/2023-02-01/publicipprefixes/predicates.go
@@ -13,23 +13,23 @@ type PublicIPPrefixOperationPredicate struct {
 
 func (p PublicIPPrefixOperationPredicate) Matches(input PublicIPPrefix) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/routefilterrules/predicates.go b/resource-manager/network/2023-02-01/routefilterrules/predicates.go
index 439bf5e7c60..3067b052089 100644
--- a/resource-manager/network/2023-02-01/routefilterrules/predicates.go
+++ b/resource-manager/network/2023-02-01/routefilterrules/predicates.go
@@ -12,19 +12,19 @@ type RouteFilterRuleOperationPredicate struct {
 
 func (p RouteFilterRuleOperationPredicate) Matches(input RouteFilterRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/routefilters/predicates.go b/resource-manager/network/2023-02-01/routefilters/predicates.go
index f2e9903f324..62b69547730 100644
--- a/resource-manager/network/2023-02-01/routefilters/predicates.go
+++ b/resource-manager/network/2023-02-01/routefilters/predicates.go
@@ -13,11 +13,11 @@ type RouteFilterOperationPredicate struct {
 
 func (p RouteFilterOperationPredicate) Matches(input RouteFilter) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p RouteFilterOperationPredicate) Matches(input RouteFilter) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/routes/predicates.go b/resource-manager/network/2023-02-01/routes/predicates.go
index 9db89e208d7..b0ff24a6573 100644
--- a/resource-manager/network/2023-02-01/routes/predicates.go
+++ b/resource-manager/network/2023-02-01/routes/predicates.go
@@ -12,19 +12,19 @@ type RouteOperationPredicate struct {
 
 func (p RouteOperationPredicate) Matches(input Route) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/routetables/predicates.go b/resource-manager/network/2023-02-01/routetables/predicates.go
index d609a04968c..e1d89b9fbd4 100644
--- a/resource-manager/network/2023-02-01/routetables/predicates.go
+++ b/resource-manager/network/2023-02-01/routetables/predicates.go
@@ -13,23 +13,23 @@ type RouteTableOperationPredicate struct {
 
 func (p RouteTableOperationPredicate) Matches(input RouteTable) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/scopeconnections/predicates.go b/resource-manager/network/2023-02-01/scopeconnections/predicates.go
index 0900eab97ca..eda309664f4 100644
--- a/resource-manager/network/2023-02-01/scopeconnections/predicates.go
+++ b/resource-manager/network/2023-02-01/scopeconnections/predicates.go
@@ -12,19 +12,19 @@ type ScopeConnectionOperationPredicate struct {
 
 func (p ScopeConnectionOperationPredicate) Matches(input ScopeConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/securityadminconfigurations/predicates.go b/resource-manager/network/2023-02-01/securityadminconfigurations/predicates.go
index 87b42dd3ac4..bcc5de9a6a8 100644
--- a/resource-manager/network/2023-02-01/securityadminconfigurations/predicates.go
+++ b/resource-manager/network/2023-02-01/securityadminconfigurations/predicates.go
@@ -12,19 +12,19 @@ type SecurityAdminConfigurationOperationPredicate struct {
 
 func (p SecurityAdminConfigurationOperationPredicate) Matches(input SecurityAdminConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/securitypartnerproviders/predicates.go b/resource-manager/network/2023-02-01/securitypartnerproviders/predicates.go
index de30add5a7f..ef826d6c55f 100644
--- a/resource-manager/network/2023-02-01/securitypartnerproviders/predicates.go
+++ b/resource-manager/network/2023-02-01/securitypartnerproviders/predicates.go
@@ -13,23 +13,23 @@ type SecurityPartnerProviderOperationPredicate struct {
 
 func (p SecurityPartnerProviderOperationPredicate) Matches(input SecurityPartnerProvider) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/securityrules/predicates.go b/resource-manager/network/2023-02-01/securityrules/predicates.go
index 1e328f61d2d..adf918c9ac4 100644
--- a/resource-manager/network/2023-02-01/securityrules/predicates.go
+++ b/resource-manager/network/2023-02-01/securityrules/predicates.go
@@ -12,19 +12,19 @@ type SecurityRuleOperationPredicate struct {
 
 func (p SecurityRuleOperationPredicate) Matches(input SecurityRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/serviceendpointpolicies/predicates.go b/resource-manager/network/2023-02-01/serviceendpointpolicies/predicates.go
index 9fe8475bd27..ddd972a1d9d 100644
--- a/resource-manager/network/2023-02-01/serviceendpointpolicies/predicates.go
+++ b/resource-manager/network/2023-02-01/serviceendpointpolicies/predicates.go
@@ -14,27 +14,27 @@ type ServiceEndpointPolicyOperationPredicate struct {
 
 func (p ServiceEndpointPolicyOperationPredicate) Matches(input ServiceEndpointPolicy) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/serviceendpointpolicydefinitions/predicates.go b/resource-manager/network/2023-02-01/serviceendpointpolicydefinitions/predicates.go
index b92a3589171..a7a08fa9deb 100644
--- a/resource-manager/network/2023-02-01/serviceendpointpolicydefinitions/predicates.go
+++ b/resource-manager/network/2023-02-01/serviceendpointpolicydefinitions/predicates.go
@@ -12,19 +12,19 @@ type ServiceEndpointPolicyDefinitionOperationPredicate struct {
 
 func (p ServiceEndpointPolicyDefinitionOperationPredicate) Matches(input ServiceEndpointPolicyDefinition) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/servicetags/predicates.go b/resource-manager/network/2023-02-01/servicetags/predicates.go
index 01e183fee6a..e10bffe6a4f 100644
--- a/resource-manager/network/2023-02-01/servicetags/predicates.go
+++ b/resource-manager/network/2023-02-01/servicetags/predicates.go
@@ -11,15 +11,15 @@ type ServiceTagInformationOperationPredicate struct {
 
 func (p ServiceTagInformationOperationPredicate) Matches(input ServiceTagInformation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ServiceTagChangeNumber != nil && (input.ServiceTagChangeNumber == nil && *p.ServiceTagChangeNumber != *input.ServiceTagChangeNumber) {
+	if p.ServiceTagChangeNumber != nil && (input.ServiceTagChangeNumber == nil || *p.ServiceTagChangeNumber != *input.ServiceTagChangeNumber) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/staticmembers/predicates.go b/resource-manager/network/2023-02-01/staticmembers/predicates.go
index 7b5a1906bbf..0fb08a96da7 100644
--- a/resource-manager/network/2023-02-01/staticmembers/predicates.go
+++ b/resource-manager/network/2023-02-01/staticmembers/predicates.go
@@ -12,19 +12,19 @@ type StaticMemberOperationPredicate struct {
 
 func (p StaticMemberOperationPredicate) Matches(input StaticMember) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/subnets/predicates.go b/resource-manager/network/2023-02-01/subnets/predicates.go
index 7c9a9678660..33b8979e3cc 100644
--- a/resource-manager/network/2023-02-01/subnets/predicates.go
+++ b/resource-manager/network/2023-02-01/subnets/predicates.go
@@ -12,19 +12,19 @@ type SubnetOperationPredicate struct {
 
 func (p SubnetOperationPredicate) Matches(input Subnet) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/usages/predicates.go b/resource-manager/network/2023-02-01/usages/predicates.go
index a37fa34c531..ad3b401c1ce 100644
--- a/resource-manager/network/2023-02-01/usages/predicates.go
+++ b/resource-manager/network/2023-02-01/usages/predicates.go
@@ -15,7 +15,7 @@ func (p UsageOperationPredicate) Matches(input Usage) bool {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/virtualappliancesites/predicates.go b/resource-manager/network/2023-02-01/virtualappliancesites/predicates.go
index a416f83b081..af31f940d24 100644
--- a/resource-manager/network/2023-02-01/virtualappliancesites/predicates.go
+++ b/resource-manager/network/2023-02-01/virtualappliancesites/predicates.go
@@ -12,19 +12,19 @@ type VirtualApplianceSiteOperationPredicate struct {
 
 func (p VirtualApplianceSiteOperationPredicate) Matches(input VirtualApplianceSite) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/virtualapplianceskus/predicates.go b/resource-manager/network/2023-02-01/virtualapplianceskus/predicates.go
index 651b08c3f2b..758bba40370 100644
--- a/resource-manager/network/2023-02-01/virtualapplianceskus/predicates.go
+++ b/resource-manager/network/2023-02-01/virtualapplianceskus/predicates.go
@@ -13,23 +13,23 @@ type NetworkVirtualApplianceSkuOperationPredicate struct {
 
 func (p NetworkVirtualApplianceSkuOperationPredicate) Matches(input NetworkVirtualApplianceSku) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/virtualnetworkgatewayconnections/predicates.go b/resource-manager/network/2023-02-01/virtualnetworkgatewayconnections/predicates.go
index 3b275eedb99..c1fe558dd66 100644
--- a/resource-manager/network/2023-02-01/virtualnetworkgatewayconnections/predicates.go
+++ b/resource-manager/network/2023-02-01/virtualnetworkgatewayconnections/predicates.go
@@ -13,23 +13,23 @@ type VirtualNetworkGatewayConnectionOperationPredicate struct {
 
 func (p VirtualNetworkGatewayConnectionOperationPredicate) Matches(input VirtualNetworkGatewayConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/virtualnetworkgateways/predicates.go b/resource-manager/network/2023-02-01/virtualnetworkgateways/predicates.go
index 4f5901d8f83..e03cad8f7b6 100644
--- a/resource-manager/network/2023-02-01/virtualnetworkgateways/predicates.go
+++ b/resource-manager/network/2023-02-01/virtualnetworkgateways/predicates.go
@@ -13,23 +13,23 @@ type VirtualNetworkGatewayOperationPredicate struct {
 
 func (p VirtualNetworkGatewayOperationPredicate) Matches(input VirtualNetworkGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -46,23 +46,23 @@ type VirtualNetworkGatewayConnectionListEntityOperationPredicate struct {
 
 func (p VirtualNetworkGatewayConnectionListEntityOperationPredicate) Matches(input VirtualNetworkGatewayConnectionListEntity) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -78,19 +78,19 @@ type VirtualNetworkGatewayNatRuleOperationPredicate struct {
 
 func (p VirtualNetworkGatewayNatRuleOperationPredicate) Matches(input VirtualNetworkGatewayNatRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/virtualnetworkpeerings/predicates.go b/resource-manager/network/2023-02-01/virtualnetworkpeerings/predicates.go
index 0435384a5d6..a945839e0b2 100644
--- a/resource-manager/network/2023-02-01/virtualnetworkpeerings/predicates.go
+++ b/resource-manager/network/2023-02-01/virtualnetworkpeerings/predicates.go
@@ -12,19 +12,19 @@ type VirtualNetworkPeeringOperationPredicate struct {
 
 func (p VirtualNetworkPeeringOperationPredicate) Matches(input VirtualNetworkPeering) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/virtualnetworks/predicates.go b/resource-manager/network/2023-02-01/virtualnetworks/predicates.go
index 6b77860abe7..32421738de2 100644
--- a/resource-manager/network/2023-02-01/virtualnetworks/predicates.go
+++ b/resource-manager/network/2023-02-01/virtualnetworks/predicates.go
@@ -11,15 +11,15 @@ type PublicIPDdosProtectionStatusResultOperationPredicate struct {
 
 func (p PublicIPDdosProtectionStatusResultOperationPredicate) Matches(input PublicIPDdosProtectionStatusResult) bool {
 
-	if p.DdosProtectionPlanId != nil && (input.DdosProtectionPlanId == nil && *p.DdosProtectionPlanId != *input.DdosProtectionPlanId) {
+	if p.DdosProtectionPlanId != nil && (input.DdosProtectionPlanId == nil || *p.DdosProtectionPlanId != *input.DdosProtectionPlanId) {
 		return false
 	}
 
-	if p.PublicIPAddress != nil && (input.PublicIPAddress == nil && *p.PublicIPAddress != *input.PublicIPAddress) {
+	if p.PublicIPAddress != nil && (input.PublicIPAddress == nil || *p.PublicIPAddress != *input.PublicIPAddress) {
 		return false
 	}
 
-	if p.PublicIPAddressId != nil && (input.PublicIPAddressId == nil && *p.PublicIPAddressId != *input.PublicIPAddressId) {
+	if p.PublicIPAddressId != nil && (input.PublicIPAddressId == nil || *p.PublicIPAddressId != *input.PublicIPAddressId) {
 		return false
 	}
 
@@ -36,23 +36,23 @@ type VirtualNetworkOperationPredicate struct {
 
 func (p VirtualNetworkOperationPredicate) Matches(input VirtualNetwork) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -68,19 +68,19 @@ type VirtualNetworkUsageOperationPredicate struct {
 
 func (p VirtualNetworkUsageOperationPredicate) Matches(input VirtualNetworkUsage) bool {
 
-	if p.CurrentValue != nil && (input.CurrentValue == nil && *p.CurrentValue != *input.CurrentValue) {
+	if p.CurrentValue != nil && (input.CurrentValue == nil || *p.CurrentValue != *input.CurrentValue) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
-	if p.Unit != nil && (input.Unit == nil && *p.Unit != *input.Unit) {
+	if p.Unit != nil && (input.Unit == nil || *p.Unit != *input.Unit) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/virtualnetworktaps/predicates.go b/resource-manager/network/2023-02-01/virtualnetworktaps/predicates.go
index 73162940ff1..0b7fb5985f4 100644
--- a/resource-manager/network/2023-02-01/virtualnetworktaps/predicates.go
+++ b/resource-manager/network/2023-02-01/virtualnetworktaps/predicates.go
@@ -13,23 +13,23 @@ type VirtualNetworkTapOperationPredicate struct {
 
 func (p VirtualNetworkTapOperationPredicate) Matches(input VirtualNetworkTap) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/virtualrouterpeerings/predicates.go b/resource-manager/network/2023-02-01/virtualrouterpeerings/predicates.go
index df3a5e39161..1e181881675 100644
--- a/resource-manager/network/2023-02-01/virtualrouterpeerings/predicates.go
+++ b/resource-manager/network/2023-02-01/virtualrouterpeerings/predicates.go
@@ -12,19 +12,19 @@ type VirtualRouterPeeringOperationPredicate struct {
 
 func (p VirtualRouterPeeringOperationPredicate) Matches(input VirtualRouterPeering) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/virtualrouters/predicates.go b/resource-manager/network/2023-02-01/virtualrouters/predicates.go
index 8533ca9181c..676ee423641 100644
--- a/resource-manager/network/2023-02-01/virtualrouters/predicates.go
+++ b/resource-manager/network/2023-02-01/virtualrouters/predicates.go
@@ -13,23 +13,23 @@ type VirtualRouterOperationPredicate struct {
 
 func (p VirtualRouterOperationPredicate) Matches(input VirtualRouter) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/virtualwans/predicates.go b/resource-manager/network/2023-02-01/virtualwans/predicates.go
index c39b54e4c7b..3eba8222dcf 100644
--- a/resource-manager/network/2023-02-01/virtualwans/predicates.go
+++ b/resource-manager/network/2023-02-01/virtualwans/predicates.go
@@ -12,19 +12,19 @@ type BgpConnectionOperationPredicate struct {
 
 func (p BgpConnectionOperationPredicate) Matches(input BgpConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,19 +40,19 @@ type HubIPConfigurationOperationPredicate struct {
 
 func (p HubIPConfigurationOperationPredicate) Matches(input HubIPConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -68,19 +68,19 @@ type HubRouteTableOperationPredicate struct {
 
 func (p HubRouteTableOperationPredicate) Matches(input HubRouteTable) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -95,15 +95,15 @@ type HubVirtualNetworkConnectionOperationPredicate struct {
 
 func (p HubVirtualNetworkConnectionOperationPredicate) Matches(input HubVirtualNetworkConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
@@ -117,11 +117,11 @@ type NetworkVirtualApplianceConnectionOperationPredicate struct {
 
 func (p NetworkVirtualApplianceConnectionOperationPredicate) Matches(input NetworkVirtualApplianceConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
@@ -138,11 +138,11 @@ type P2SVpnGatewayOperationPredicate struct {
 
 func (p P2SVpnGatewayOperationPredicate) Matches(input P2SVpnGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -150,11 +150,11 @@ func (p P2SVpnGatewayOperationPredicate) Matches(input P2SVpnGateway) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -170,19 +170,19 @@ type RouteMapOperationPredicate struct {
 
 func (p RouteMapOperationPredicate) Matches(input RouteMap) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -198,19 +198,19 @@ type RoutingIntentOperationPredicate struct {
 
 func (p RoutingIntentOperationPredicate) Matches(input RoutingIntent) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -228,15 +228,15 @@ type VirtualHubOperationPredicate struct {
 
 func (p VirtualHubOperationPredicate) Matches(input VirtualHub) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -244,11 +244,11 @@ func (p VirtualHubOperationPredicate) Matches(input VirtualHub) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -263,15 +263,15 @@ type VirtualHubRouteTableV2OperationPredicate struct {
 
 func (p VirtualHubRouteTableV2OperationPredicate) Matches(input VirtualHubRouteTableV2) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
@@ -288,11 +288,11 @@ type VirtualWANOperationPredicate struct {
 
 func (p VirtualWANOperationPredicate) Matches(input VirtualWAN) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -300,11 +300,11 @@ func (p VirtualWANOperationPredicate) Matches(input VirtualWAN) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -319,15 +319,15 @@ type VpnConnectionOperationPredicate struct {
 
 func (p VpnConnectionOperationPredicate) Matches(input VpnConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
@@ -344,11 +344,11 @@ type VpnGatewayOperationPredicate struct {
 
 func (p VpnGatewayOperationPredicate) Matches(input VpnGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -356,11 +356,11 @@ func (p VpnGatewayOperationPredicate) Matches(input VpnGateway) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -376,19 +376,19 @@ type VpnGatewayNatRuleOperationPredicate struct {
 
 func (p VpnGatewayNatRuleOperationPredicate) Matches(input VpnGatewayNatRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -405,23 +405,23 @@ type VpnServerConfigurationOperationPredicate struct {
 
 func (p VpnServerConfigurationOperationPredicate) Matches(input VpnServerConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -437,19 +437,19 @@ type VpnServerConfigurationPolicyGroupOperationPredicate struct {
 
 func (p VpnServerConfigurationPolicyGroupOperationPredicate) Matches(input VpnServerConfigurationPolicyGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -466,11 +466,11 @@ type VpnSiteOperationPredicate struct {
 
 func (p VpnSiteOperationPredicate) Matches(input VpnSite) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -478,11 +478,11 @@ func (p VpnSiteOperationPredicate) Matches(input VpnSite) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -498,19 +498,19 @@ type VpnSiteLinkOperationPredicate struct {
 
 func (p VpnSiteLinkOperationPredicate) Matches(input VpnSiteLink) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -526,19 +526,19 @@ type VpnSiteLinkConnectionOperationPredicate struct {
 
 func (p VpnSiteLinkConnectionOperationPredicate) Matches(input VpnSiteLinkConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/vmsspublicipaddresses/predicates.go b/resource-manager/network/2023-02-01/vmsspublicipaddresses/predicates.go
index 2ba46e3bd91..3173ab41a32 100644
--- a/resource-manager/network/2023-02-01/vmsspublicipaddresses/predicates.go
+++ b/resource-manager/network/2023-02-01/vmsspublicipaddresses/predicates.go
@@ -13,23 +13,23 @@ type PublicIPAddressOperationPredicate struct {
 
 func (p PublicIPAddressOperationPredicate) Matches(input PublicIPAddress) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/webapplicationfirewallpolicies/predicates.go b/resource-manager/network/2023-02-01/webapplicationfirewallpolicies/predicates.go
index 9bdf8d1c8b6..a7973b0a14f 100644
--- a/resource-manager/network/2023-02-01/webapplicationfirewallpolicies/predicates.go
+++ b/resource-manager/network/2023-02-01/webapplicationfirewallpolicies/predicates.go
@@ -13,23 +13,23 @@ type WebApplicationFirewallPolicyOperationPredicate struct {
 
 func (p WebApplicationFirewallPolicyOperationPredicate) Matches(input WebApplicationFirewallPolicy) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-02-01/webcategories/predicates.go b/resource-manager/network/2023-02-01/webcategories/predicates.go
index 28bacd194ee..ab82b0c92b5 100644
--- a/resource-manager/network/2023-02-01/webcategories/predicates.go
+++ b/resource-manager/network/2023-02-01/webcategories/predicates.go
@@ -12,19 +12,19 @@ type AzureWebCategoryOperationPredicate struct {
 
 func (p AzureWebCategoryOperationPredicate) Matches(input AzureWebCategory) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/adminrulecollections/predicates.go b/resource-manager/network/2023-04-01/adminrulecollections/predicates.go
index 2f10067f017..67b37b95643 100644
--- a/resource-manager/network/2023-04-01/adminrulecollections/predicates.go
+++ b/resource-manager/network/2023-04-01/adminrulecollections/predicates.go
@@ -12,19 +12,19 @@ type AdminRuleCollectionOperationPredicate struct {
 
 func (p AdminRuleCollectionOperationPredicate) Matches(input AdminRuleCollection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/applicationgatewayprivateendpointconnections/predicates.go b/resource-manager/network/2023-04-01/applicationgatewayprivateendpointconnections/predicates.go
index ce7e107fd0d..46757c5239b 100644
--- a/resource-manager/network/2023-04-01/applicationgatewayprivateendpointconnections/predicates.go
+++ b/resource-manager/network/2023-04-01/applicationgatewayprivateendpointconnections/predicates.go
@@ -12,19 +12,19 @@ type ApplicationGatewayPrivateEndpointConnectionOperationPredicate struct {
 
 func (p ApplicationGatewayPrivateEndpointConnectionOperationPredicate) Matches(input ApplicationGatewayPrivateEndpointConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/applicationgatewayprivatelinkresources/predicates.go b/resource-manager/network/2023-04-01/applicationgatewayprivatelinkresources/predicates.go
index 717ca511a70..e93c21bb751 100644
--- a/resource-manager/network/2023-04-01/applicationgatewayprivatelinkresources/predicates.go
+++ b/resource-manager/network/2023-04-01/applicationgatewayprivatelinkresources/predicates.go
@@ -12,19 +12,19 @@ type ApplicationGatewayPrivateLinkResourceOperationPredicate struct {
 
 func (p ApplicationGatewayPrivateLinkResourceOperationPredicate) Matches(input ApplicationGatewayPrivateLinkResource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/applicationgateways/predicates.go b/resource-manager/network/2023-04-01/applicationgateways/predicates.go
index ff35d27f30c..c51e6f7b000 100644
--- a/resource-manager/network/2023-04-01/applicationgateways/predicates.go
+++ b/resource-manager/network/2023-04-01/applicationgateways/predicates.go
@@ -13,23 +13,23 @@ type ApplicationGatewayOperationPredicate struct {
 
 func (p ApplicationGatewayOperationPredicate) Matches(input ApplicationGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -43,11 +43,11 @@ type ApplicationGatewaySslPredefinedPolicyOperationPredicate struct {
 
 func (p ApplicationGatewaySslPredefinedPolicyOperationPredicate) Matches(input ApplicationGatewaySslPredefinedPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/applicationgatewaywafdynamicmanifests/predicates.go b/resource-manager/network/2023-04-01/applicationgatewaywafdynamicmanifests/predicates.go
index 71fb8558fc1..9714d21637e 100644
--- a/resource-manager/network/2023-04-01/applicationgatewaywafdynamicmanifests/predicates.go
+++ b/resource-manager/network/2023-04-01/applicationgatewaywafdynamicmanifests/predicates.go
@@ -11,15 +11,15 @@ type ApplicationGatewayWafDynamicManifestResultOperationPredicate struct {
 
 func (p ApplicationGatewayWafDynamicManifestResultOperationPredicate) Matches(input ApplicationGatewayWafDynamicManifestResult) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/applicationsecuritygroups/predicates.go b/resource-manager/network/2023-04-01/applicationsecuritygroups/predicates.go
index bb7f348a2a4..6ea534ecd89 100644
--- a/resource-manager/network/2023-04-01/applicationsecuritygroups/predicates.go
+++ b/resource-manager/network/2023-04-01/applicationsecuritygroups/predicates.go
@@ -13,23 +13,23 @@ type ApplicationSecurityGroupOperationPredicate struct {
 
 func (p ApplicationSecurityGroupOperationPredicate) Matches(input ApplicationSecurityGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/availabledelegations/predicates.go b/resource-manager/network/2023-04-01/availabledelegations/predicates.go
index ed867e9cb60..caf6b904077 100644
--- a/resource-manager/network/2023-04-01/availabledelegations/predicates.go
+++ b/resource-manager/network/2023-04-01/availabledelegations/predicates.go
@@ -12,19 +12,19 @@ type AvailableDelegationOperationPredicate struct {
 
 func (p AvailableDelegationOperationPredicate) Matches(input AvailableDelegation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ServiceName != nil && (input.ServiceName == nil && *p.ServiceName != *input.ServiceName) {
+	if p.ServiceName != nil && (input.ServiceName == nil || *p.ServiceName != *input.ServiceName) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/availableservicealiases/predicates.go b/resource-manager/network/2023-04-01/availableservicealiases/predicates.go
index 9949a5723d5..afe2abff9ab 100644
--- a/resource-manager/network/2023-04-01/availableservicealiases/predicates.go
+++ b/resource-manager/network/2023-04-01/availableservicealiases/predicates.go
@@ -12,19 +12,19 @@ type AvailableServiceAliasOperationPredicate struct {
 
 func (p AvailableServiceAliasOperationPredicate) Matches(input AvailableServiceAlias) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceName != nil && (input.ResourceName == nil && *p.ResourceName != *input.ResourceName) {
+	if p.ResourceName != nil && (input.ResourceName == nil || *p.ResourceName != *input.ResourceName) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/azurefirewalls/predicates.go b/resource-manager/network/2023-04-01/azurefirewalls/predicates.go
index eef0c0724f3..68ca8da5623 100644
--- a/resource-manager/network/2023-04-01/azurefirewalls/predicates.go
+++ b/resource-manager/network/2023-04-01/azurefirewalls/predicates.go
@@ -13,23 +13,23 @@ type AzureFirewallOperationPredicate struct {
 
 func (p AzureFirewallOperationPredicate) Matches(input AzureFirewall) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/bastionhosts/predicates.go b/resource-manager/network/2023-04-01/bastionhosts/predicates.go
index a5e3edd0204..3c3835a32d0 100644
--- a/resource-manager/network/2023-04-01/bastionhosts/predicates.go
+++ b/resource-manager/network/2023-04-01/bastionhosts/predicates.go
@@ -18,43 +18,43 @@ type BastionActiveSessionOperationPredicate struct {
 
 func (p BastionActiveSessionOperationPredicate) Matches(input BastionActiveSession) bool {
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
-	if p.SessionDurationInMins != nil && (input.SessionDurationInMins == nil && *p.SessionDurationInMins != *input.SessionDurationInMins) {
+	if p.SessionDurationInMins != nil && (input.SessionDurationInMins == nil || *p.SessionDurationInMins != *input.SessionDurationInMins) {
 		return false
 	}
 
-	if p.SessionId != nil && (input.SessionId == nil && *p.SessionId != *input.SessionId) {
+	if p.SessionId != nil && (input.SessionId == nil || *p.SessionId != *input.SessionId) {
 		return false
 	}
 
-	if p.StartTime != nil && (input.StartTime == nil && *p.StartTime != *input.StartTime) {
+	if p.StartTime != nil && (input.StartTime == nil || *p.StartTime != *input.StartTime) {
 		return false
 	}
 
-	if p.TargetHostName != nil && (input.TargetHostName == nil && *p.TargetHostName != *input.TargetHostName) {
+	if p.TargetHostName != nil && (input.TargetHostName == nil || *p.TargetHostName != *input.TargetHostName) {
 		return false
 	}
 
-	if p.TargetIPAddress != nil && (input.TargetIPAddress == nil && *p.TargetIPAddress != *input.TargetIPAddress) {
+	if p.TargetIPAddress != nil && (input.TargetIPAddress == nil || *p.TargetIPAddress != *input.TargetIPAddress) {
 		return false
 	}
 
-	if p.TargetResourceGroup != nil && (input.TargetResourceGroup == nil && *p.TargetResourceGroup != *input.TargetResourceGroup) {
+	if p.TargetResourceGroup != nil && (input.TargetResourceGroup == nil || *p.TargetResourceGroup != *input.TargetResourceGroup) {
 		return false
 	}
 
-	if p.TargetResourceId != nil && (input.TargetResourceId == nil && *p.TargetResourceId != *input.TargetResourceId) {
+	if p.TargetResourceId != nil && (input.TargetResourceId == nil || *p.TargetResourceId != *input.TargetResourceId) {
 		return false
 	}
 
-	if p.TargetSubscriptionId != nil && (input.TargetSubscriptionId == nil && *p.TargetSubscriptionId != *input.TargetSubscriptionId) {
+	if p.TargetSubscriptionId != nil && (input.TargetSubscriptionId == nil || *p.TargetSubscriptionId != *input.TargetSubscriptionId) {
 		return false
 	}
 
-	if p.UserName != nil && (input.UserName == nil && *p.UserName != *input.UserName) {
+	if p.UserName != nil && (input.UserName == nil || *p.UserName != *input.UserName) {
 		return false
 	}
 
@@ -71,23 +71,23 @@ type BastionHostOperationPredicate struct {
 
 func (p BastionHostOperationPredicate) Matches(input BastionHost) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -102,15 +102,15 @@ type BastionSessionStateOperationPredicate struct {
 
 func (p BastionSessionStateOperationPredicate) Matches(input BastionSessionState) bool {
 
-	if p.Message != nil && (input.Message == nil && *p.Message != *input.Message) {
+	if p.Message != nil && (input.Message == nil || *p.Message != *input.Message) {
 		return false
 	}
 
-	if p.SessionId != nil && (input.SessionId == nil && *p.SessionId != *input.SessionId) {
+	if p.SessionId != nil && (input.SessionId == nil || *p.SessionId != *input.SessionId) {
 		return false
 	}
 
-	if p.State != nil && (input.State == nil && *p.State != *input.State) {
+	if p.State != nil && (input.State == nil || *p.State != *input.State) {
 		return false
 	}
 
@@ -125,15 +125,15 @@ type BastionShareableLinkOperationPredicate struct {
 
 func (p BastionShareableLinkOperationPredicate) Matches(input BastionShareableLink) bool {
 
-	if p.Bsl != nil && (input.Bsl == nil && *p.Bsl != *input.Bsl) {
+	if p.Bsl != nil && (input.Bsl == nil || *p.Bsl != *input.Bsl) {
 		return false
 	}
 
-	if p.CreatedAt != nil && (input.CreatedAt == nil && *p.CreatedAt != *input.CreatedAt) {
+	if p.CreatedAt != nil && (input.CreatedAt == nil || *p.CreatedAt != *input.CreatedAt) {
 		return false
 	}
 
-	if p.Message != nil && (input.Message == nil && *p.Message != *input.Message) {
+	if p.Message != nil && (input.Message == nil || *p.Message != *input.Message) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/bastionshareablelink/predicates.go b/resource-manager/network/2023-04-01/bastionshareablelink/predicates.go
index ce72bc40681..15f07095262 100644
--- a/resource-manager/network/2023-04-01/bastionshareablelink/predicates.go
+++ b/resource-manager/network/2023-04-01/bastionshareablelink/predicates.go
@@ -11,15 +11,15 @@ type BastionShareableLinkOperationPredicate struct {
 
 func (p BastionShareableLinkOperationPredicate) Matches(input BastionShareableLink) bool {
 
-	if p.Bsl != nil && (input.Bsl == nil && *p.Bsl != *input.Bsl) {
+	if p.Bsl != nil && (input.Bsl == nil || *p.Bsl != *input.Bsl) {
 		return false
 	}
 
-	if p.CreatedAt != nil && (input.CreatedAt == nil && *p.CreatedAt != *input.CreatedAt) {
+	if p.CreatedAt != nil && (input.CreatedAt == nil || *p.CreatedAt != *input.CreatedAt) {
 		return false
 	}
 
-	if p.Message != nil && (input.Message == nil && *p.Message != *input.Message) {
+	if p.Message != nil && (input.Message == nil || *p.Message != *input.Message) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/bgpservicecommunities/predicates.go b/resource-manager/network/2023-04-01/bgpservicecommunities/predicates.go
index ae5019b967b..2e90f55ae55 100644
--- a/resource-manager/network/2023-04-01/bgpservicecommunities/predicates.go
+++ b/resource-manager/network/2023-04-01/bgpservicecommunities/predicates.go
@@ -12,19 +12,19 @@ type BgpServiceCommunityOperationPredicate struct {
 
 func (p BgpServiceCommunityOperationPredicate) Matches(input BgpServiceCommunity) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/cloudservicepublicipaddresses/predicates.go b/resource-manager/network/2023-04-01/cloudservicepublicipaddresses/predicates.go
index 0c1aab1e694..f27f03144ee 100644
--- a/resource-manager/network/2023-04-01/cloudservicepublicipaddresses/predicates.go
+++ b/resource-manager/network/2023-04-01/cloudservicepublicipaddresses/predicates.go
@@ -13,23 +13,23 @@ type PublicIPAddressOperationPredicate struct {
 
 func (p PublicIPAddressOperationPredicate) Matches(input PublicIPAddress) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/connectivityconfigurations/predicates.go b/resource-manager/network/2023-04-01/connectivityconfigurations/predicates.go
index a581c573c65..ecab73247f2 100644
--- a/resource-manager/network/2023-04-01/connectivityconfigurations/predicates.go
+++ b/resource-manager/network/2023-04-01/connectivityconfigurations/predicates.go
@@ -12,19 +12,19 @@ type ConnectivityConfigurationOperationPredicate struct {
 
 func (p ConnectivityConfigurationOperationPredicate) Matches(input ConnectivityConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/customipprefixes/predicates.go b/resource-manager/network/2023-04-01/customipprefixes/predicates.go
index a7d5ffe920a..288f9cfa042 100644
--- a/resource-manager/network/2023-04-01/customipprefixes/predicates.go
+++ b/resource-manager/network/2023-04-01/customipprefixes/predicates.go
@@ -13,23 +13,23 @@ type CustomIPPrefixOperationPredicate struct {
 
 func (p CustomIPPrefixOperationPredicate) Matches(input CustomIPPrefix) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/ddosprotectionplans/predicates.go b/resource-manager/network/2023-04-01/ddosprotectionplans/predicates.go
index f0bd539d370..6ad9bbf5374 100644
--- a/resource-manager/network/2023-04-01/ddosprotectionplans/predicates.go
+++ b/resource-manager/network/2023-04-01/ddosprotectionplans/predicates.go
@@ -13,23 +13,23 @@ type DdosProtectionPlanOperationPredicate struct {
 
 func (p DdosProtectionPlanOperationPredicate) Matches(input DdosProtectionPlan) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/dscpconfigurations/predicates.go b/resource-manager/network/2023-04-01/dscpconfigurations/predicates.go
index 2281e144720..7628df6beb6 100644
--- a/resource-manager/network/2023-04-01/dscpconfigurations/predicates.go
+++ b/resource-manager/network/2023-04-01/dscpconfigurations/predicates.go
@@ -13,23 +13,23 @@ type DscpConfigurationOperationPredicate struct {
 
 func (p DscpConfigurationOperationPredicate) Matches(input DscpConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/endpointservices/predicates.go b/resource-manager/network/2023-04-01/endpointservices/predicates.go
index 1e48205c952..9a5ec06a288 100644
--- a/resource-manager/network/2023-04-01/endpointservices/predicates.go
+++ b/resource-manager/network/2023-04-01/endpointservices/predicates.go
@@ -11,15 +11,15 @@ type EndpointServiceResultOperationPredicate struct {
 
 func (p EndpointServiceResultOperationPredicate) Matches(input EndpointServiceResult) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/expressroutecircuitauthorizations/predicates.go b/resource-manager/network/2023-04-01/expressroutecircuitauthorizations/predicates.go
index 4a3d75102ac..3533e80a13e 100644
--- a/resource-manager/network/2023-04-01/expressroutecircuitauthorizations/predicates.go
+++ b/resource-manager/network/2023-04-01/expressroutecircuitauthorizations/predicates.go
@@ -12,19 +12,19 @@ type ExpressRouteCircuitAuthorizationOperationPredicate struct {
 
 func (p ExpressRouteCircuitAuthorizationOperationPredicate) Matches(input ExpressRouteCircuitAuthorization) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/expressroutecircuitconnections/predicates.go b/resource-manager/network/2023-04-01/expressroutecircuitconnections/predicates.go
index 697aab56df9..6c65b4df05d 100644
--- a/resource-manager/network/2023-04-01/expressroutecircuitconnections/predicates.go
+++ b/resource-manager/network/2023-04-01/expressroutecircuitconnections/predicates.go
@@ -12,19 +12,19 @@ type ExpressRouteCircuitConnectionOperationPredicate struct {
 
 func (p ExpressRouteCircuitConnectionOperationPredicate) Matches(input ExpressRouteCircuitConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/expressroutecircuitpeerings/predicates.go b/resource-manager/network/2023-04-01/expressroutecircuitpeerings/predicates.go
index 8b3551606e8..1e725c4e63a 100644
--- a/resource-manager/network/2023-04-01/expressroutecircuitpeerings/predicates.go
+++ b/resource-manager/network/2023-04-01/expressroutecircuitpeerings/predicates.go
@@ -12,19 +12,19 @@ type ExpressRouteCircuitPeeringOperationPredicate struct {
 
 func (p ExpressRouteCircuitPeeringOperationPredicate) Matches(input ExpressRouteCircuitPeering) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/expressroutecircuits/predicates.go b/resource-manager/network/2023-04-01/expressroutecircuits/predicates.go
index c0013d9656e..3fdbc040dbf 100644
--- a/resource-manager/network/2023-04-01/expressroutecircuits/predicates.go
+++ b/resource-manager/network/2023-04-01/expressroutecircuits/predicates.go
@@ -13,23 +13,23 @@ type ExpressRouteCircuitOperationPredicate struct {
 
 func (p ExpressRouteCircuitOperationPredicate) Matches(input ExpressRouteCircuit) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/expressroutecrossconnectionpeerings/predicates.go b/resource-manager/network/2023-04-01/expressroutecrossconnectionpeerings/predicates.go
index a21509eb010..abec5984ec1 100644
--- a/resource-manager/network/2023-04-01/expressroutecrossconnectionpeerings/predicates.go
+++ b/resource-manager/network/2023-04-01/expressroutecrossconnectionpeerings/predicates.go
@@ -11,15 +11,15 @@ type ExpressRouteCrossConnectionPeeringOperationPredicate struct {
 
 func (p ExpressRouteCrossConnectionPeeringOperationPredicate) Matches(input ExpressRouteCrossConnectionPeering) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/expressroutecrossconnections/predicates.go b/resource-manager/network/2023-04-01/expressroutecrossconnections/predicates.go
index 2b30277eb5d..f3d9b3a8dff 100644
--- a/resource-manager/network/2023-04-01/expressroutecrossconnections/predicates.go
+++ b/resource-manager/network/2023-04-01/expressroutecrossconnections/predicates.go
@@ -13,23 +13,23 @@ type ExpressRouteCrossConnectionOperationPredicate struct {
 
 func (p ExpressRouteCrossConnectionOperationPredicate) Matches(input ExpressRouteCrossConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/expressroutelinks/predicates.go b/resource-manager/network/2023-04-01/expressroutelinks/predicates.go
index c5955ad29e5..bd6127afc55 100644
--- a/resource-manager/network/2023-04-01/expressroutelinks/predicates.go
+++ b/resource-manager/network/2023-04-01/expressroutelinks/predicates.go
@@ -11,15 +11,15 @@ type ExpressRouteLinkOperationPredicate struct {
 
 func (p ExpressRouteLinkOperationPredicate) Matches(input ExpressRouteLink) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/expressrouteportauthorizations/predicates.go b/resource-manager/network/2023-04-01/expressrouteportauthorizations/predicates.go
index 2cdc970dad0..d12fc29e52a 100644
--- a/resource-manager/network/2023-04-01/expressrouteportauthorizations/predicates.go
+++ b/resource-manager/network/2023-04-01/expressrouteportauthorizations/predicates.go
@@ -12,19 +12,19 @@ type ExpressRoutePortAuthorizationOperationPredicate struct {
 
 func (p ExpressRoutePortAuthorizationOperationPredicate) Matches(input ExpressRoutePortAuthorization) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/expressrouteports/predicates.go b/resource-manager/network/2023-04-01/expressrouteports/predicates.go
index 26d4591a65f..7339fac991b 100644
--- a/resource-manager/network/2023-04-01/expressrouteports/predicates.go
+++ b/resource-manager/network/2023-04-01/expressrouteports/predicates.go
@@ -13,23 +13,23 @@ type ExpressRoutePortOperationPredicate struct {
 
 func (p ExpressRoutePortOperationPredicate) Matches(input ExpressRoutePort) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/expressrouteportslocations/predicates.go b/resource-manager/network/2023-04-01/expressrouteportslocations/predicates.go
index 43649ada37d..3b345c2e1f5 100644
--- a/resource-manager/network/2023-04-01/expressrouteportslocations/predicates.go
+++ b/resource-manager/network/2023-04-01/expressrouteportslocations/predicates.go
@@ -12,19 +12,19 @@ type ExpressRoutePortsLocationOperationPredicate struct {
 
 func (p ExpressRoutePortsLocationOperationPredicate) Matches(input ExpressRoutePortsLocation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/expressrouteserviceproviders/predicates.go b/resource-manager/network/2023-04-01/expressrouteserviceproviders/predicates.go
index baa5b8aba7a..d2c605983d7 100644
--- a/resource-manager/network/2023-04-01/expressrouteserviceproviders/predicates.go
+++ b/resource-manager/network/2023-04-01/expressrouteserviceproviders/predicates.go
@@ -12,19 +12,19 @@ type ExpressRouteServiceProviderOperationPredicate struct {
 
 func (p ExpressRouteServiceProviderOperationPredicate) Matches(input ExpressRouteServiceProvider) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/firewallpolicies/predicates.go b/resource-manager/network/2023-04-01/firewallpolicies/predicates.go
index b95e12c63e2..2640042ba7a 100644
--- a/resource-manager/network/2023-04-01/firewallpolicies/predicates.go
+++ b/resource-manager/network/2023-04-01/firewallpolicies/predicates.go
@@ -13,23 +13,23 @@ type FirewallPolicyOperationPredicate struct {
 
 func (p FirewallPolicyOperationPredicate) Matches(input FirewallPolicy) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/firewallpolicyrulecollectiongroups/predicates.go b/resource-manager/network/2023-04-01/firewallpolicyrulecollectiongroups/predicates.go
index c190891d1a1..9762acada56 100644
--- a/resource-manager/network/2023-04-01/firewallpolicyrulecollectiongroups/predicates.go
+++ b/resource-manager/network/2023-04-01/firewallpolicyrulecollectiongroups/predicates.go
@@ -12,19 +12,19 @@ type FirewallPolicyRuleCollectionGroupOperationPredicate struct {
 
 func (p FirewallPolicyRuleCollectionGroupOperationPredicate) Matches(input FirewallPolicyRuleCollectionGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/flowlogs/predicates.go b/resource-manager/network/2023-04-01/flowlogs/predicates.go
index 1aa47092e55..746df2611cc 100644
--- a/resource-manager/network/2023-04-01/flowlogs/predicates.go
+++ b/resource-manager/network/2023-04-01/flowlogs/predicates.go
@@ -13,23 +13,23 @@ type FlowLogOperationPredicate struct {
 
 func (p FlowLogOperationPredicate) Matches(input FlowLog) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/ipallocations/predicates.go b/resource-manager/network/2023-04-01/ipallocations/predicates.go
index 866a19a7190..5f4e136ae66 100644
--- a/resource-manager/network/2023-04-01/ipallocations/predicates.go
+++ b/resource-manager/network/2023-04-01/ipallocations/predicates.go
@@ -13,23 +13,23 @@ type IPAllocationOperationPredicate struct {
 
 func (p IPAllocationOperationPredicate) Matches(input IPAllocation) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/ipgroups/predicates.go b/resource-manager/network/2023-04-01/ipgroups/predicates.go
index 705b10e2ed0..a64e98c2290 100644
--- a/resource-manager/network/2023-04-01/ipgroups/predicates.go
+++ b/resource-manager/network/2023-04-01/ipgroups/predicates.go
@@ -13,23 +13,23 @@ type IPGroupOperationPredicate struct {
 
 func (p IPGroupOperationPredicate) Matches(input IPGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/loadbalancers/predicates.go b/resource-manager/network/2023-04-01/loadbalancers/predicates.go
index b5cc68245b6..82f247704c6 100644
--- a/resource-manager/network/2023-04-01/loadbalancers/predicates.go
+++ b/resource-manager/network/2023-04-01/loadbalancers/predicates.go
@@ -12,19 +12,19 @@ type BackendAddressPoolOperationPredicate struct {
 
 func (p BackendAddressPoolOperationPredicate) Matches(input BackendAddressPool) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,19 +40,19 @@ type FrontendIPConfigurationOperationPredicate struct {
 
 func (p FrontendIPConfigurationOperationPredicate) Matches(input FrontendIPConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -68,19 +68,19 @@ type InboundNatRuleOperationPredicate struct {
 
 func (p InboundNatRuleOperationPredicate) Matches(input InboundNatRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -97,23 +97,23 @@ type LoadBalancerOperationPredicate struct {
 
 func (p LoadBalancerOperationPredicate) Matches(input LoadBalancer) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -129,19 +129,19 @@ type LoadBalancingRuleOperationPredicate struct {
 
 func (p LoadBalancingRuleOperationPredicate) Matches(input LoadBalancingRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -158,23 +158,23 @@ type NetworkInterfaceOperationPredicate struct {
 
 func (p NetworkInterfaceOperationPredicate) Matches(input NetworkInterface) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -190,19 +190,19 @@ type OutboundRuleOperationPredicate struct {
 
 func (p OutboundRuleOperationPredicate) Matches(input OutboundRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -218,19 +218,19 @@ type ProbeOperationPredicate struct {
 
 func (p ProbeOperationPredicate) Matches(input Probe) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/localnetworkgateways/predicates.go b/resource-manager/network/2023-04-01/localnetworkgateways/predicates.go
index 462c9037886..d4e529f8a9c 100644
--- a/resource-manager/network/2023-04-01/localnetworkgateways/predicates.go
+++ b/resource-manager/network/2023-04-01/localnetworkgateways/predicates.go
@@ -13,23 +13,23 @@ type LocalNetworkGatewayOperationPredicate struct {
 
 func (p LocalNetworkGatewayOperationPredicate) Matches(input LocalNetworkGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/natgateways/predicates.go b/resource-manager/network/2023-04-01/natgateways/predicates.go
index d5cfb6b66fc..c0e09cf2f07 100644
--- a/resource-manager/network/2023-04-01/natgateways/predicates.go
+++ b/resource-manager/network/2023-04-01/natgateways/predicates.go
@@ -13,23 +13,23 @@ type NatGatewayOperationPredicate struct {
 
 func (p NatGatewayOperationPredicate) Matches(input NatGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/networkgroups/predicates.go b/resource-manager/network/2023-04-01/networkgroups/predicates.go
index d38c9efbbfc..621d0d7b40a 100644
--- a/resource-manager/network/2023-04-01/networkgroups/predicates.go
+++ b/resource-manager/network/2023-04-01/networkgroups/predicates.go
@@ -12,19 +12,19 @@ type NetworkGroupOperationPredicate struct {
 
 func (p NetworkGroupOperationPredicate) Matches(input NetworkGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/networkinterfaces/predicates.go b/resource-manager/network/2023-04-01/networkinterfaces/predicates.go
index 941725ff11e..1bdf1a16800 100644
--- a/resource-manager/network/2023-04-01/networkinterfaces/predicates.go
+++ b/resource-manager/network/2023-04-01/networkinterfaces/predicates.go
@@ -13,23 +13,23 @@ type LoadBalancerOperationPredicate struct {
 
 func (p LoadBalancerOperationPredicate) Matches(input LoadBalancer) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -46,23 +46,23 @@ type NetworkInterfaceOperationPredicate struct {
 
 func (p NetworkInterfaceOperationPredicate) Matches(input NetworkInterface) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -78,19 +78,19 @@ type NetworkInterfaceIPConfigurationOperationPredicate struct {
 
 func (p NetworkInterfaceIPConfigurationOperationPredicate) Matches(input NetworkInterfaceIPConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -106,19 +106,19 @@ type NetworkInterfaceTapConfigurationOperationPredicate struct {
 
 func (p NetworkInterfaceTapConfigurationOperationPredicate) Matches(input NetworkInterfaceTapConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/networkmanagerconnections/predicates.go b/resource-manager/network/2023-04-01/networkmanagerconnections/predicates.go
index a4d1d456e2e..145b7b7261a 100644
--- a/resource-manager/network/2023-04-01/networkmanagerconnections/predicates.go
+++ b/resource-manager/network/2023-04-01/networkmanagerconnections/predicates.go
@@ -12,19 +12,19 @@ type NetworkManagerConnectionOperationPredicate struct {
 
 func (p NetworkManagerConnectionOperationPredicate) Matches(input NetworkManagerConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/networkmanagers/predicates.go b/resource-manager/network/2023-04-01/networkmanagers/predicates.go
index fee18f9eea0..7c1597c2666 100644
--- a/resource-manager/network/2023-04-01/networkmanagers/predicates.go
+++ b/resource-manager/network/2023-04-01/networkmanagers/predicates.go
@@ -13,23 +13,23 @@ type NetworkManagerOperationPredicate struct {
 
 func (p NetworkManagerOperationPredicate) Matches(input NetworkManager) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/networkprofiles/predicates.go b/resource-manager/network/2023-04-01/networkprofiles/predicates.go
index c1ae5ce4c79..c8b72ff46b2 100644
--- a/resource-manager/network/2023-04-01/networkprofiles/predicates.go
+++ b/resource-manager/network/2023-04-01/networkprofiles/predicates.go
@@ -13,23 +13,23 @@ type NetworkProfileOperationPredicate struct {
 
 func (p NetworkProfileOperationPredicate) Matches(input NetworkProfile) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/networksecuritygroups/predicates.go b/resource-manager/network/2023-04-01/networksecuritygroups/predicates.go
index 156bd00cd3d..b9f6d3f3df5 100644
--- a/resource-manager/network/2023-04-01/networksecuritygroups/predicates.go
+++ b/resource-manager/network/2023-04-01/networksecuritygroups/predicates.go
@@ -13,23 +13,23 @@ type NetworkSecurityGroupOperationPredicate struct {
 
 func (p NetworkSecurityGroupOperationPredicate) Matches(input NetworkSecurityGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/networkvirtualappliances/predicates.go b/resource-manager/network/2023-04-01/networkvirtualappliances/predicates.go
index d9e9dfa93ea..676b2af6c25 100644
--- a/resource-manager/network/2023-04-01/networkvirtualappliances/predicates.go
+++ b/resource-manager/network/2023-04-01/networkvirtualappliances/predicates.go
@@ -13,23 +13,23 @@ type NetworkVirtualApplianceOperationPredicate struct {
 
 func (p NetworkVirtualApplianceOperationPredicate) Matches(input NetworkVirtualAppliance) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/peerexpressroutecircuitconnections/predicates.go b/resource-manager/network/2023-04-01/peerexpressroutecircuitconnections/predicates.go
index 967ae9d3147..c0766bb2d18 100644
--- a/resource-manager/network/2023-04-01/peerexpressroutecircuitconnections/predicates.go
+++ b/resource-manager/network/2023-04-01/peerexpressroutecircuitconnections/predicates.go
@@ -12,19 +12,19 @@ type PeerExpressRouteCircuitConnectionOperationPredicate struct {
 
 func (p PeerExpressRouteCircuitConnectionOperationPredicate) Matches(input PeerExpressRouteCircuitConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/privatednszonegroups/predicates.go b/resource-manager/network/2023-04-01/privatednszonegroups/predicates.go
index f77b300cd94..4d27803d6e2 100644
--- a/resource-manager/network/2023-04-01/privatednszonegroups/predicates.go
+++ b/resource-manager/network/2023-04-01/privatednszonegroups/predicates.go
@@ -11,15 +11,15 @@ type PrivateDnsZoneGroupOperationPredicate struct {
 
 func (p PrivateDnsZoneGroupOperationPredicate) Matches(input PrivateDnsZoneGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/privateendpoints/predicates.go b/resource-manager/network/2023-04-01/privateendpoints/predicates.go
index c2c9137a231..c99098d0163 100644
--- a/resource-manager/network/2023-04-01/privateendpoints/predicates.go
+++ b/resource-manager/network/2023-04-01/privateendpoints/predicates.go
@@ -13,23 +13,23 @@ type AvailablePrivateEndpointTypeOperationPredicate struct {
 
 func (p AvailablePrivateEndpointTypeOperationPredicate) Matches(input AvailablePrivateEndpointType) bool {
 
-	if p.DisplayName != nil && (input.DisplayName == nil && *p.DisplayName != *input.DisplayName) {
+	if p.DisplayName != nil && (input.DisplayName == nil || *p.DisplayName != *input.DisplayName) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceName != nil && (input.ResourceName == nil && *p.ResourceName != *input.ResourceName) {
+	if p.ResourceName != nil && (input.ResourceName == nil || *p.ResourceName != *input.ResourceName) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -46,23 +46,23 @@ type PrivateEndpointOperationPredicate struct {
 
 func (p PrivateEndpointOperationPredicate) Matches(input PrivateEndpoint) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/privatelinkservices/predicates.go b/resource-manager/network/2023-04-01/privatelinkservices/predicates.go
index 44963c73ff0..f7e18f9feee 100644
--- a/resource-manager/network/2023-04-01/privatelinkservices/predicates.go
+++ b/resource-manager/network/2023-04-01/privatelinkservices/predicates.go
@@ -9,7 +9,7 @@ type AutoApprovedPrivateLinkServiceOperationPredicate struct {
 
 func (p AutoApprovedPrivateLinkServiceOperationPredicate) Matches(input AutoApprovedPrivateLinkService) bool {
 
-	if p.PrivateLinkService != nil && (input.PrivateLinkService == nil && *p.PrivateLinkService != *input.PrivateLinkService) {
+	if p.PrivateLinkService != nil && (input.PrivateLinkService == nil || *p.PrivateLinkService != *input.PrivateLinkService) {
 		return false
 	}
 
@@ -25,19 +25,19 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -54,23 +54,23 @@ type PrivateLinkServiceOperationPredicate struct {
 
 func (p PrivateLinkServiceOperationPredicate) Matches(input PrivateLinkService) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/publicipaddresses/predicates.go b/resource-manager/network/2023-04-01/publicipaddresses/predicates.go
index 9d8f3f36a5b..07d29ffa733 100644
--- a/resource-manager/network/2023-04-01/publicipaddresses/predicates.go
+++ b/resource-manager/network/2023-04-01/publicipaddresses/predicates.go
@@ -13,23 +13,23 @@ type PublicIPAddressOperationPredicate struct {
 
 func (p PublicIPAddressOperationPredicate) Matches(input PublicIPAddress) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/publicipprefixes/predicates.go b/resource-manager/network/2023-04-01/publicipprefixes/predicates.go
index 26580cf1658..7deb3ca2bbf 100644
--- a/resource-manager/network/2023-04-01/publicipprefixes/predicates.go
+++ b/resource-manager/network/2023-04-01/publicipprefixes/predicates.go
@@ -13,23 +13,23 @@ type PublicIPPrefixOperationPredicate struct {
 
 func (p PublicIPPrefixOperationPredicate) Matches(input PublicIPPrefix) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/routefilterrules/predicates.go b/resource-manager/network/2023-04-01/routefilterrules/predicates.go
index 439bf5e7c60..3067b052089 100644
--- a/resource-manager/network/2023-04-01/routefilterrules/predicates.go
+++ b/resource-manager/network/2023-04-01/routefilterrules/predicates.go
@@ -12,19 +12,19 @@ type RouteFilterRuleOperationPredicate struct {
 
 func (p RouteFilterRuleOperationPredicate) Matches(input RouteFilterRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/routefilters/predicates.go b/resource-manager/network/2023-04-01/routefilters/predicates.go
index f2e9903f324..62b69547730 100644
--- a/resource-manager/network/2023-04-01/routefilters/predicates.go
+++ b/resource-manager/network/2023-04-01/routefilters/predicates.go
@@ -13,11 +13,11 @@ type RouteFilterOperationPredicate struct {
 
 func (p RouteFilterOperationPredicate) Matches(input RouteFilter) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p RouteFilterOperationPredicate) Matches(input RouteFilter) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/routes/predicates.go b/resource-manager/network/2023-04-01/routes/predicates.go
index 9db89e208d7..b0ff24a6573 100644
--- a/resource-manager/network/2023-04-01/routes/predicates.go
+++ b/resource-manager/network/2023-04-01/routes/predicates.go
@@ -12,19 +12,19 @@ type RouteOperationPredicate struct {
 
 func (p RouteOperationPredicate) Matches(input Route) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/routetables/predicates.go b/resource-manager/network/2023-04-01/routetables/predicates.go
index d609a04968c..e1d89b9fbd4 100644
--- a/resource-manager/network/2023-04-01/routetables/predicates.go
+++ b/resource-manager/network/2023-04-01/routetables/predicates.go
@@ -13,23 +13,23 @@ type RouteTableOperationPredicate struct {
 
 func (p RouteTableOperationPredicate) Matches(input RouteTable) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/scopeconnections/predicates.go b/resource-manager/network/2023-04-01/scopeconnections/predicates.go
index 0900eab97ca..eda309664f4 100644
--- a/resource-manager/network/2023-04-01/scopeconnections/predicates.go
+++ b/resource-manager/network/2023-04-01/scopeconnections/predicates.go
@@ -12,19 +12,19 @@ type ScopeConnectionOperationPredicate struct {
 
 func (p ScopeConnectionOperationPredicate) Matches(input ScopeConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/securityadminconfigurations/predicates.go b/resource-manager/network/2023-04-01/securityadminconfigurations/predicates.go
index 87b42dd3ac4..bcc5de9a6a8 100644
--- a/resource-manager/network/2023-04-01/securityadminconfigurations/predicates.go
+++ b/resource-manager/network/2023-04-01/securityadminconfigurations/predicates.go
@@ -12,19 +12,19 @@ type SecurityAdminConfigurationOperationPredicate struct {
 
 func (p SecurityAdminConfigurationOperationPredicate) Matches(input SecurityAdminConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/securitypartnerproviders/predicates.go b/resource-manager/network/2023-04-01/securitypartnerproviders/predicates.go
index de30add5a7f..ef826d6c55f 100644
--- a/resource-manager/network/2023-04-01/securitypartnerproviders/predicates.go
+++ b/resource-manager/network/2023-04-01/securitypartnerproviders/predicates.go
@@ -13,23 +13,23 @@ type SecurityPartnerProviderOperationPredicate struct {
 
 func (p SecurityPartnerProviderOperationPredicate) Matches(input SecurityPartnerProvider) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/securityrules/predicates.go b/resource-manager/network/2023-04-01/securityrules/predicates.go
index 1e328f61d2d..adf918c9ac4 100644
--- a/resource-manager/network/2023-04-01/securityrules/predicates.go
+++ b/resource-manager/network/2023-04-01/securityrules/predicates.go
@@ -12,19 +12,19 @@ type SecurityRuleOperationPredicate struct {
 
 func (p SecurityRuleOperationPredicate) Matches(input SecurityRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/serviceendpointpolicies/predicates.go b/resource-manager/network/2023-04-01/serviceendpointpolicies/predicates.go
index 9fe8475bd27..ddd972a1d9d 100644
--- a/resource-manager/network/2023-04-01/serviceendpointpolicies/predicates.go
+++ b/resource-manager/network/2023-04-01/serviceendpointpolicies/predicates.go
@@ -14,27 +14,27 @@ type ServiceEndpointPolicyOperationPredicate struct {
 
 func (p ServiceEndpointPolicyOperationPredicate) Matches(input ServiceEndpointPolicy) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/serviceendpointpolicydefinitions/predicates.go b/resource-manager/network/2023-04-01/serviceendpointpolicydefinitions/predicates.go
index b92a3589171..a7a08fa9deb 100644
--- a/resource-manager/network/2023-04-01/serviceendpointpolicydefinitions/predicates.go
+++ b/resource-manager/network/2023-04-01/serviceendpointpolicydefinitions/predicates.go
@@ -12,19 +12,19 @@ type ServiceEndpointPolicyDefinitionOperationPredicate struct {
 
 func (p ServiceEndpointPolicyDefinitionOperationPredicate) Matches(input ServiceEndpointPolicyDefinition) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/servicetags/predicates.go b/resource-manager/network/2023-04-01/servicetags/predicates.go
index 01e183fee6a..e10bffe6a4f 100644
--- a/resource-manager/network/2023-04-01/servicetags/predicates.go
+++ b/resource-manager/network/2023-04-01/servicetags/predicates.go
@@ -11,15 +11,15 @@ type ServiceTagInformationOperationPredicate struct {
 
 func (p ServiceTagInformationOperationPredicate) Matches(input ServiceTagInformation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ServiceTagChangeNumber != nil && (input.ServiceTagChangeNumber == nil && *p.ServiceTagChangeNumber != *input.ServiceTagChangeNumber) {
+	if p.ServiceTagChangeNumber != nil && (input.ServiceTagChangeNumber == nil || *p.ServiceTagChangeNumber != *input.ServiceTagChangeNumber) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/staticmembers/predicates.go b/resource-manager/network/2023-04-01/staticmembers/predicates.go
index 7b5a1906bbf..0fb08a96da7 100644
--- a/resource-manager/network/2023-04-01/staticmembers/predicates.go
+++ b/resource-manager/network/2023-04-01/staticmembers/predicates.go
@@ -12,19 +12,19 @@ type StaticMemberOperationPredicate struct {
 
 func (p StaticMemberOperationPredicate) Matches(input StaticMember) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/subnets/predicates.go b/resource-manager/network/2023-04-01/subnets/predicates.go
index 7c9a9678660..33b8979e3cc 100644
--- a/resource-manager/network/2023-04-01/subnets/predicates.go
+++ b/resource-manager/network/2023-04-01/subnets/predicates.go
@@ -12,19 +12,19 @@ type SubnetOperationPredicate struct {
 
 func (p SubnetOperationPredicate) Matches(input Subnet) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/usages/predicates.go b/resource-manager/network/2023-04-01/usages/predicates.go
index a37fa34c531..ad3b401c1ce 100644
--- a/resource-manager/network/2023-04-01/usages/predicates.go
+++ b/resource-manager/network/2023-04-01/usages/predicates.go
@@ -15,7 +15,7 @@ func (p UsageOperationPredicate) Matches(input Usage) bool {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/virtualappliancesites/predicates.go b/resource-manager/network/2023-04-01/virtualappliancesites/predicates.go
index a416f83b081..af31f940d24 100644
--- a/resource-manager/network/2023-04-01/virtualappliancesites/predicates.go
+++ b/resource-manager/network/2023-04-01/virtualappliancesites/predicates.go
@@ -12,19 +12,19 @@ type VirtualApplianceSiteOperationPredicate struct {
 
 func (p VirtualApplianceSiteOperationPredicate) Matches(input VirtualApplianceSite) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/virtualapplianceskus/predicates.go b/resource-manager/network/2023-04-01/virtualapplianceskus/predicates.go
index 651b08c3f2b..758bba40370 100644
--- a/resource-manager/network/2023-04-01/virtualapplianceskus/predicates.go
+++ b/resource-manager/network/2023-04-01/virtualapplianceskus/predicates.go
@@ -13,23 +13,23 @@ type NetworkVirtualApplianceSkuOperationPredicate struct {
 
 func (p NetworkVirtualApplianceSkuOperationPredicate) Matches(input NetworkVirtualApplianceSku) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/virtualnetworkgatewayconnections/predicates.go b/resource-manager/network/2023-04-01/virtualnetworkgatewayconnections/predicates.go
index 3b275eedb99..c1fe558dd66 100644
--- a/resource-manager/network/2023-04-01/virtualnetworkgatewayconnections/predicates.go
+++ b/resource-manager/network/2023-04-01/virtualnetworkgatewayconnections/predicates.go
@@ -13,23 +13,23 @@ type VirtualNetworkGatewayConnectionOperationPredicate struct {
 
 func (p VirtualNetworkGatewayConnectionOperationPredicate) Matches(input VirtualNetworkGatewayConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/virtualnetworkgateways/predicates.go b/resource-manager/network/2023-04-01/virtualnetworkgateways/predicates.go
index 4f5901d8f83..e03cad8f7b6 100644
--- a/resource-manager/network/2023-04-01/virtualnetworkgateways/predicates.go
+++ b/resource-manager/network/2023-04-01/virtualnetworkgateways/predicates.go
@@ -13,23 +13,23 @@ type VirtualNetworkGatewayOperationPredicate struct {
 
 func (p VirtualNetworkGatewayOperationPredicate) Matches(input VirtualNetworkGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -46,23 +46,23 @@ type VirtualNetworkGatewayConnectionListEntityOperationPredicate struct {
 
 func (p VirtualNetworkGatewayConnectionListEntityOperationPredicate) Matches(input VirtualNetworkGatewayConnectionListEntity) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -78,19 +78,19 @@ type VirtualNetworkGatewayNatRuleOperationPredicate struct {
 
 func (p VirtualNetworkGatewayNatRuleOperationPredicate) Matches(input VirtualNetworkGatewayNatRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/virtualnetworkpeerings/predicates.go b/resource-manager/network/2023-04-01/virtualnetworkpeerings/predicates.go
index 0435384a5d6..a945839e0b2 100644
--- a/resource-manager/network/2023-04-01/virtualnetworkpeerings/predicates.go
+++ b/resource-manager/network/2023-04-01/virtualnetworkpeerings/predicates.go
@@ -12,19 +12,19 @@ type VirtualNetworkPeeringOperationPredicate struct {
 
 func (p VirtualNetworkPeeringOperationPredicate) Matches(input VirtualNetworkPeering) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/virtualnetworks/predicates.go b/resource-manager/network/2023-04-01/virtualnetworks/predicates.go
index 6b77860abe7..32421738de2 100644
--- a/resource-manager/network/2023-04-01/virtualnetworks/predicates.go
+++ b/resource-manager/network/2023-04-01/virtualnetworks/predicates.go
@@ -11,15 +11,15 @@ type PublicIPDdosProtectionStatusResultOperationPredicate struct {
 
 func (p PublicIPDdosProtectionStatusResultOperationPredicate) Matches(input PublicIPDdosProtectionStatusResult) bool {
 
-	if p.DdosProtectionPlanId != nil && (input.DdosProtectionPlanId == nil && *p.DdosProtectionPlanId != *input.DdosProtectionPlanId) {
+	if p.DdosProtectionPlanId != nil && (input.DdosProtectionPlanId == nil || *p.DdosProtectionPlanId != *input.DdosProtectionPlanId) {
 		return false
 	}
 
-	if p.PublicIPAddress != nil && (input.PublicIPAddress == nil && *p.PublicIPAddress != *input.PublicIPAddress) {
+	if p.PublicIPAddress != nil && (input.PublicIPAddress == nil || *p.PublicIPAddress != *input.PublicIPAddress) {
 		return false
 	}
 
-	if p.PublicIPAddressId != nil && (input.PublicIPAddressId == nil && *p.PublicIPAddressId != *input.PublicIPAddressId) {
+	if p.PublicIPAddressId != nil && (input.PublicIPAddressId == nil || *p.PublicIPAddressId != *input.PublicIPAddressId) {
 		return false
 	}
 
@@ -36,23 +36,23 @@ type VirtualNetworkOperationPredicate struct {
 
 func (p VirtualNetworkOperationPredicate) Matches(input VirtualNetwork) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -68,19 +68,19 @@ type VirtualNetworkUsageOperationPredicate struct {
 
 func (p VirtualNetworkUsageOperationPredicate) Matches(input VirtualNetworkUsage) bool {
 
-	if p.CurrentValue != nil && (input.CurrentValue == nil && *p.CurrentValue != *input.CurrentValue) {
+	if p.CurrentValue != nil && (input.CurrentValue == nil || *p.CurrentValue != *input.CurrentValue) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
-	if p.Unit != nil && (input.Unit == nil && *p.Unit != *input.Unit) {
+	if p.Unit != nil && (input.Unit == nil || *p.Unit != *input.Unit) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/virtualnetworktaps/predicates.go b/resource-manager/network/2023-04-01/virtualnetworktaps/predicates.go
index 73162940ff1..0b7fb5985f4 100644
--- a/resource-manager/network/2023-04-01/virtualnetworktaps/predicates.go
+++ b/resource-manager/network/2023-04-01/virtualnetworktaps/predicates.go
@@ -13,23 +13,23 @@ type VirtualNetworkTapOperationPredicate struct {
 
 func (p VirtualNetworkTapOperationPredicate) Matches(input VirtualNetworkTap) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/virtualrouterpeerings/predicates.go b/resource-manager/network/2023-04-01/virtualrouterpeerings/predicates.go
index df3a5e39161..1e181881675 100644
--- a/resource-manager/network/2023-04-01/virtualrouterpeerings/predicates.go
+++ b/resource-manager/network/2023-04-01/virtualrouterpeerings/predicates.go
@@ -12,19 +12,19 @@ type VirtualRouterPeeringOperationPredicate struct {
 
 func (p VirtualRouterPeeringOperationPredicate) Matches(input VirtualRouterPeering) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/virtualrouters/predicates.go b/resource-manager/network/2023-04-01/virtualrouters/predicates.go
index 8533ca9181c..676ee423641 100644
--- a/resource-manager/network/2023-04-01/virtualrouters/predicates.go
+++ b/resource-manager/network/2023-04-01/virtualrouters/predicates.go
@@ -13,23 +13,23 @@ type VirtualRouterOperationPredicate struct {
 
 func (p VirtualRouterOperationPredicate) Matches(input VirtualRouter) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/virtualwans/predicates.go b/resource-manager/network/2023-04-01/virtualwans/predicates.go
index c39b54e4c7b..3eba8222dcf 100644
--- a/resource-manager/network/2023-04-01/virtualwans/predicates.go
+++ b/resource-manager/network/2023-04-01/virtualwans/predicates.go
@@ -12,19 +12,19 @@ type BgpConnectionOperationPredicate struct {
 
 func (p BgpConnectionOperationPredicate) Matches(input BgpConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,19 +40,19 @@ type HubIPConfigurationOperationPredicate struct {
 
 func (p HubIPConfigurationOperationPredicate) Matches(input HubIPConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -68,19 +68,19 @@ type HubRouteTableOperationPredicate struct {
 
 func (p HubRouteTableOperationPredicate) Matches(input HubRouteTable) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -95,15 +95,15 @@ type HubVirtualNetworkConnectionOperationPredicate struct {
 
 func (p HubVirtualNetworkConnectionOperationPredicate) Matches(input HubVirtualNetworkConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
@@ -117,11 +117,11 @@ type NetworkVirtualApplianceConnectionOperationPredicate struct {
 
 func (p NetworkVirtualApplianceConnectionOperationPredicate) Matches(input NetworkVirtualApplianceConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
@@ -138,11 +138,11 @@ type P2SVpnGatewayOperationPredicate struct {
 
 func (p P2SVpnGatewayOperationPredicate) Matches(input P2SVpnGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -150,11 +150,11 @@ func (p P2SVpnGatewayOperationPredicate) Matches(input P2SVpnGateway) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -170,19 +170,19 @@ type RouteMapOperationPredicate struct {
 
 func (p RouteMapOperationPredicate) Matches(input RouteMap) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -198,19 +198,19 @@ type RoutingIntentOperationPredicate struct {
 
 func (p RoutingIntentOperationPredicate) Matches(input RoutingIntent) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -228,15 +228,15 @@ type VirtualHubOperationPredicate struct {
 
 func (p VirtualHubOperationPredicate) Matches(input VirtualHub) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -244,11 +244,11 @@ func (p VirtualHubOperationPredicate) Matches(input VirtualHub) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -263,15 +263,15 @@ type VirtualHubRouteTableV2OperationPredicate struct {
 
 func (p VirtualHubRouteTableV2OperationPredicate) Matches(input VirtualHubRouteTableV2) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
@@ -288,11 +288,11 @@ type VirtualWANOperationPredicate struct {
 
 func (p VirtualWANOperationPredicate) Matches(input VirtualWAN) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -300,11 +300,11 @@ func (p VirtualWANOperationPredicate) Matches(input VirtualWAN) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -319,15 +319,15 @@ type VpnConnectionOperationPredicate struct {
 
 func (p VpnConnectionOperationPredicate) Matches(input VpnConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
@@ -344,11 +344,11 @@ type VpnGatewayOperationPredicate struct {
 
 func (p VpnGatewayOperationPredicate) Matches(input VpnGateway) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -356,11 +356,11 @@ func (p VpnGatewayOperationPredicate) Matches(input VpnGateway) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -376,19 +376,19 @@ type VpnGatewayNatRuleOperationPredicate struct {
 
 func (p VpnGatewayNatRuleOperationPredicate) Matches(input VpnGatewayNatRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -405,23 +405,23 @@ type VpnServerConfigurationOperationPredicate struct {
 
 func (p VpnServerConfigurationOperationPredicate) Matches(input VpnServerConfiguration) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -437,19 +437,19 @@ type VpnServerConfigurationPolicyGroupOperationPredicate struct {
 
 func (p VpnServerConfigurationPolicyGroupOperationPredicate) Matches(input VpnServerConfigurationPolicyGroup) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -466,11 +466,11 @@ type VpnSiteOperationPredicate struct {
 
 func (p VpnSiteOperationPredicate) Matches(input VpnSite) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -478,11 +478,11 @@ func (p VpnSiteOperationPredicate) Matches(input VpnSite) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -498,19 +498,19 @@ type VpnSiteLinkOperationPredicate struct {
 
 func (p VpnSiteLinkOperationPredicate) Matches(input VpnSiteLink) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -526,19 +526,19 @@ type VpnSiteLinkConnectionOperationPredicate struct {
 
 func (p VpnSiteLinkConnectionOperationPredicate) Matches(input VpnSiteLinkConnection) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/vmsspublicipaddresses/predicates.go b/resource-manager/network/2023-04-01/vmsspublicipaddresses/predicates.go
index 2ba46e3bd91..3173ab41a32 100644
--- a/resource-manager/network/2023-04-01/vmsspublicipaddresses/predicates.go
+++ b/resource-manager/network/2023-04-01/vmsspublicipaddresses/predicates.go
@@ -13,23 +13,23 @@ type PublicIPAddressOperationPredicate struct {
 
 func (p PublicIPAddressOperationPredicate) Matches(input PublicIPAddress) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/webapplicationfirewallpolicies/predicates.go b/resource-manager/network/2023-04-01/webapplicationfirewallpolicies/predicates.go
index 9bdf8d1c8b6..a7973b0a14f 100644
--- a/resource-manager/network/2023-04-01/webapplicationfirewallpolicies/predicates.go
+++ b/resource-manager/network/2023-04-01/webapplicationfirewallpolicies/predicates.go
@@ -13,23 +13,23 @@ type WebApplicationFirewallPolicyOperationPredicate struct {
 
 func (p WebApplicationFirewallPolicyOperationPredicate) Matches(input WebApplicationFirewallPolicy) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/network/2023-04-01/webcategories/predicates.go b/resource-manager/network/2023-04-01/webcategories/predicates.go
index 28bacd194ee..ab82b0c92b5 100644
--- a/resource-manager/network/2023-04-01/webcategories/predicates.go
+++ b/resource-manager/network/2023-04-01/webcategories/predicates.go
@@ -12,19 +12,19 @@ type AzureWebCategoryOperationPredicate struct {
 
 func (p AzureWebCategoryOperationPredicate) Matches(input AzureWebCategory) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/networkfunction/2022-08-01/azuretrafficcollectors/predicates.go b/resource-manager/networkfunction/2022-08-01/azuretrafficcollectors/predicates.go
index f55f79a3755..60bee3232d6 100644
--- a/resource-manager/networkfunction/2022-08-01/azuretrafficcollectors/predicates.go
+++ b/resource-manager/networkfunction/2022-08-01/azuretrafficcollectors/predicates.go
@@ -13,23 +13,23 @@ type AzureTrafficCollectorOperationPredicate struct {
 
 func (p AzureTrafficCollectorOperationPredicate) Matches(input AzureTrafficCollector) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/networkfunction/2022-08-01/collectorpolicies/predicates.go b/resource-manager/networkfunction/2022-08-01/collectorpolicies/predicates.go
index 2e48fbe6005..6ca3c39d7f6 100644
--- a/resource-manager/networkfunction/2022-08-01/collectorpolicies/predicates.go
+++ b/resource-manager/networkfunction/2022-08-01/collectorpolicies/predicates.go
@@ -13,23 +13,23 @@ type CollectorPolicyOperationPredicate struct {
 
 func (p CollectorPolicyOperationPredicate) Matches(input CollectorPolicy) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/networkfunction/2022-11-01/azuretrafficcollectors/predicates.go b/resource-manager/networkfunction/2022-11-01/azuretrafficcollectors/predicates.go
index b1576b90522..9776c362382 100644
--- a/resource-manager/networkfunction/2022-11-01/azuretrafficcollectors/predicates.go
+++ b/resource-manager/networkfunction/2022-11-01/azuretrafficcollectors/predicates.go
@@ -13,11 +13,11 @@ type AzureTrafficCollectorOperationPredicate struct {
 
 func (p AzureTrafficCollectorOperationPredicate) Matches(input AzureTrafficCollector) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p AzureTrafficCollectorOperationPredicate) Matches(input AzureTrafficColle
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/networkfunction/2022-11-01/collectorpolicies/predicates.go b/resource-manager/networkfunction/2022-11-01/collectorpolicies/predicates.go
index 9152f5addab..4e6ea711959 100644
--- a/resource-manager/networkfunction/2022-11-01/collectorpolicies/predicates.go
+++ b/resource-manager/networkfunction/2022-11-01/collectorpolicies/predicates.go
@@ -13,11 +13,11 @@ type CollectorPolicyOperationPredicate struct {
 
 func (p CollectorPolicyOperationPredicate) Matches(input CollectorPolicy) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p CollectorPolicyOperationPredicate) Matches(input CollectorPolicy) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/newrelic/2022-07-01/accounts/predicates.go b/resource-manager/newrelic/2022-07-01/accounts/predicates.go
index 6f035bdc8a7..4574e9d8270 100644
--- a/resource-manager/newrelic/2022-07-01/accounts/predicates.go
+++ b/resource-manager/newrelic/2022-07-01/accounts/predicates.go
@@ -11,15 +11,15 @@ type AccountResourceOperationPredicate struct {
 
 func (p AccountResourceOperationPredicate) Matches(input AccountResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/newrelic/2022-07-01/monitors/predicates.go b/resource-manager/newrelic/2022-07-01/monitors/predicates.go
index de1ddedd30b..1d292bb5e54 100644
--- a/resource-manager/newrelic/2022-07-01/monitors/predicates.go
+++ b/resource-manager/newrelic/2022-07-01/monitors/predicates.go
@@ -11,15 +11,15 @@ type AppServiceInfoOperationPredicate struct {
 
 func (p AppServiceInfoOperationPredicate) Matches(input AppServiceInfo) bool {
 
-	if p.AgentStatus != nil && (input.AgentStatus == nil && *p.AgentStatus != *input.AgentStatus) {
+	if p.AgentStatus != nil && (input.AgentStatus == nil || *p.AgentStatus != *input.AgentStatus) {
 		return false
 	}
 
-	if p.AgentVersion != nil && (input.AgentVersion == nil && *p.AgentVersion != *input.AgentVersion) {
+	if p.AgentVersion != nil && (input.AgentVersion == nil || *p.AgentVersion != *input.AgentVersion) {
 		return false
 	}
 
-	if p.AzureResourceId != nil && (input.AzureResourceId == nil && *p.AzureResourceId != *input.AzureResourceId) {
+	if p.AzureResourceId != nil && (input.AzureResourceId == nil || *p.AzureResourceId != *input.AzureResourceId) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type MonitoredResourceOperationPredicate struct {
 
 func (p MonitoredResourceOperationPredicate) Matches(input MonitoredResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.ReasonForLogsStatus != nil && (input.ReasonForLogsStatus == nil && *p.ReasonForLogsStatus != *input.ReasonForLogsStatus) {
+	if p.ReasonForLogsStatus != nil && (input.ReasonForLogsStatus == nil || *p.ReasonForLogsStatus != *input.ReasonForLogsStatus) {
 		return false
 	}
 
-	if p.ReasonForMetricsStatus != nil && (input.ReasonForMetricsStatus == nil && *p.ReasonForMetricsStatus != *input.ReasonForMetricsStatus) {
+	if p.ReasonForMetricsStatus != nil && (input.ReasonForMetricsStatus == nil || *p.ReasonForMetricsStatus != *input.ReasonForMetricsStatus) {
 		return false
 	}
 
@@ -58,7 +58,7 @@ type NewRelicMonitorResourceOperationPredicate struct {
 
 func (p NewRelicMonitorResourceOperationPredicate) Matches(input NewRelicMonitorResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -66,11 +66,11 @@ func (p NewRelicMonitorResourceOperationPredicate) Matches(input NewRelicMonitor
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -85,15 +85,15 @@ type VMInfoOperationPredicate struct {
 
 func (p VMInfoOperationPredicate) Matches(input VMInfo) bool {
 
-	if p.AgentStatus != nil && (input.AgentStatus == nil && *p.AgentStatus != *input.AgentStatus) {
+	if p.AgentStatus != nil && (input.AgentStatus == nil || *p.AgentStatus != *input.AgentStatus) {
 		return false
 	}
 
-	if p.AgentVersion != nil && (input.AgentVersion == nil && *p.AgentVersion != *input.AgentVersion) {
+	if p.AgentVersion != nil && (input.AgentVersion == nil || *p.AgentVersion != *input.AgentVersion) {
 		return false
 	}
 
-	if p.VMId != nil && (input.VMId == nil && *p.VMId != *input.VMId) {
+	if p.VMId != nil && (input.VMId == nil || *p.VMId != *input.VMId) {
 		return false
 	}
 
diff --git a/resource-manager/newrelic/2022-07-01/organizations/predicates.go b/resource-manager/newrelic/2022-07-01/organizations/predicates.go
index 547f3c10fca..963f8c85666 100644
--- a/resource-manager/newrelic/2022-07-01/organizations/predicates.go
+++ b/resource-manager/newrelic/2022-07-01/organizations/predicates.go
@@ -11,15 +11,15 @@ type OrganizationResourceOperationPredicate struct {
 
 func (p OrganizationResourceOperationPredicate) Matches(input OrganizationResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/newrelic/2022-07-01/plan/predicates.go b/resource-manager/newrelic/2022-07-01/plan/predicates.go
index 9ae689c6623..faeea21815c 100644
--- a/resource-manager/newrelic/2022-07-01/plan/predicates.go
+++ b/resource-manager/newrelic/2022-07-01/plan/predicates.go
@@ -11,15 +11,15 @@ type PlanDataResourceOperationPredicate struct {
 
 func (p PlanDataResourceOperationPredicate) Matches(input PlanDataResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/newrelic/2022-07-01/tagrules/predicates.go b/resource-manager/newrelic/2022-07-01/tagrules/predicates.go
index 0d3e21a1382..b8e7c533c9f 100644
--- a/resource-manager/newrelic/2022-07-01/tagrules/predicates.go
+++ b/resource-manager/newrelic/2022-07-01/tagrules/predicates.go
@@ -11,15 +11,15 @@ type TagRuleOperationPredicate struct {
 
 func (p TagRuleOperationPredicate) Matches(input TagRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/nginx/2022-08-01/nginxcertificate/predicates.go b/resource-manager/nginx/2022-08-01/nginxcertificate/predicates.go
index 0206ffbe8ba..b01a724d879 100644
--- a/resource-manager/nginx/2022-08-01/nginxcertificate/predicates.go
+++ b/resource-manager/nginx/2022-08-01/nginxcertificate/predicates.go
@@ -12,19 +12,19 @@ type NginxCertificateOperationPredicate struct {
 
 func (p NginxCertificateOperationPredicate) Matches(input NginxCertificate) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/nginx/2022-08-01/nginxconfiguration/predicates.go b/resource-manager/nginx/2022-08-01/nginxconfiguration/predicates.go
index d2086313175..0958a9d2b5d 100644
--- a/resource-manager/nginx/2022-08-01/nginxconfiguration/predicates.go
+++ b/resource-manager/nginx/2022-08-01/nginxconfiguration/predicates.go
@@ -12,19 +12,19 @@ type NginxConfigurationOperationPredicate struct {
 
 func (p NginxConfigurationOperationPredicate) Matches(input NginxConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/nginx/2022-08-01/nginxdeployment/predicates.go b/resource-manager/nginx/2022-08-01/nginxdeployment/predicates.go
index 57158e7d3ba..d1754320d3a 100644
--- a/resource-manager/nginx/2022-08-01/nginxdeployment/predicates.go
+++ b/resource-manager/nginx/2022-08-01/nginxdeployment/predicates.go
@@ -12,19 +12,19 @@ type NginxDeploymentOperationPredicate struct {
 
 func (p NginxDeploymentOperationPredicate) Matches(input NginxDeployment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/notificationhubs/2017-04-01/namespaces/predicates.go b/resource-manager/notificationhubs/2017-04-01/namespaces/predicates.go
index 0be9b28e1d7..1371d82553c 100644
--- a/resource-manager/notificationhubs/2017-04-01/namespaces/predicates.go
+++ b/resource-manager/notificationhubs/2017-04-01/namespaces/predicates.go
@@ -12,19 +12,19 @@ type NamespaceResourceOperationPredicate struct {
 
 func (p NamespaceResourceOperationPredicate) Matches(input NamespaceResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,19 +40,19 @@ type SharedAccessAuthorizationRuleResourceOperationPredicate struct {
 
 func (p SharedAccessAuthorizationRuleResourceOperationPredicate) Matches(input SharedAccessAuthorizationRuleResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/notificationhubs/2017-04-01/notificationhubs/predicates.go b/resource-manager/notificationhubs/2017-04-01/notificationhubs/predicates.go
index dd4584d6289..e32214ae72a 100644
--- a/resource-manager/notificationhubs/2017-04-01/notificationhubs/predicates.go
+++ b/resource-manager/notificationhubs/2017-04-01/notificationhubs/predicates.go
@@ -12,19 +12,19 @@ type NotificationHubResourceOperationPredicate struct {
 
 func (p NotificationHubResourceOperationPredicate) Matches(input NotificationHubResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,19 +40,19 @@ type SharedAccessAuthorizationRuleResourceOperationPredicate struct {
 
 func (p SharedAccessAuthorizationRuleResourceOperationPredicate) Matches(input SharedAccessAuthorizationRuleResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/operationalinsights/2019-09-01/querypackqueries/predicates.go b/resource-manager/operationalinsights/2019-09-01/querypackqueries/predicates.go
index fd71e43bed2..38fda83f51a 100644
--- a/resource-manager/operationalinsights/2019-09-01/querypackqueries/predicates.go
+++ b/resource-manager/operationalinsights/2019-09-01/querypackqueries/predicates.go
@@ -11,15 +11,15 @@ type LogAnalyticsQueryPackQueryOperationPredicate struct {
 
 func (p LogAnalyticsQueryPackQueryOperationPredicate) Matches(input LogAnalyticsQueryPackQuery) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/operationalinsights/2019-09-01/querypacks/predicates.go b/resource-manager/operationalinsights/2019-09-01/querypacks/predicates.go
index 16f342c7d1f..46c21c9f019 100644
--- a/resource-manager/operationalinsights/2019-09-01/querypacks/predicates.go
+++ b/resource-manager/operationalinsights/2019-09-01/querypacks/predicates.go
@@ -12,7 +12,7 @@ type LogAnalyticsQueryPackOperationPredicate struct {
 
 func (p LogAnalyticsQueryPackOperationPredicate) Matches(input LogAnalyticsQueryPack) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p LogAnalyticsQueryPackOperationPredicate) Matches(input LogAnalyticsQuery
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/operationalinsights/2020-08-01/clusters/predicates.go b/resource-manager/operationalinsights/2020-08-01/clusters/predicates.go
index 7c9c4692854..cc13b7c6220 100644
--- a/resource-manager/operationalinsights/2020-08-01/clusters/predicates.go
+++ b/resource-manager/operationalinsights/2020-08-01/clusters/predicates.go
@@ -12,7 +12,7 @@ type ClusterOperationPredicate struct {
 
 func (p ClusterOperationPredicate) Matches(input Cluster) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ClusterOperationPredicate) Matches(input Cluster) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/operationalinsights/2020-08-01/datasources/predicates.go b/resource-manager/operationalinsights/2020-08-01/datasources/predicates.go
index 657898ef4fa..1fa7b8ec8d5 100644
--- a/resource-manager/operationalinsights/2020-08-01/datasources/predicates.go
+++ b/resource-manager/operationalinsights/2020-08-01/datasources/predicates.go
@@ -13,15 +13,15 @@ type DataSourceOperationPredicate struct {
 
 func (p DataSourceOperationPredicate) Matches(input DataSource) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
@@ -29,7 +29,7 @@ func (p DataSourceOperationPredicate) Matches(input DataSource) bool {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/operationalinsights/2020-08-01/storageinsights/predicates.go b/resource-manager/operationalinsights/2020-08-01/storageinsights/predicates.go
index abd05c6b1cf..c926b61601e 100644
--- a/resource-manager/operationalinsights/2020-08-01/storageinsights/predicates.go
+++ b/resource-manager/operationalinsights/2020-08-01/storageinsights/predicates.go
@@ -12,19 +12,19 @@ type StorageInsightOperationPredicate struct {
 
 func (p StorageInsightOperationPredicate) Matches(input StorageInsight) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/orbital/2022-11-01/contact/predicates.go b/resource-manager/orbital/2022-11-01/contact/predicates.go
index 0ee6c4d93a4..03e7171175f 100644
--- a/resource-manager/orbital/2022-11-01/contact/predicates.go
+++ b/resource-manager/orbital/2022-11-01/contact/predicates.go
@@ -9,7 +9,7 @@ type AvailableContactsOperationPredicate struct {
 
 func (p AvailableContactsOperationPredicate) Matches(input AvailableContacts) bool {
 
-	if p.GroundStationName != nil && (input.GroundStationName == nil && *p.GroundStationName != *input.GroundStationName) {
+	if p.GroundStationName != nil && (input.GroundStationName == nil || *p.GroundStationName != *input.GroundStationName) {
 		return false
 	}
 
@@ -24,15 +24,15 @@ type ContactOperationPredicate struct {
 
 func (p ContactOperationPredicate) Matches(input Contact) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/orbital/2022-11-01/contactprofile/predicates.go b/resource-manager/orbital/2022-11-01/contactprofile/predicates.go
index 087e26c90b7..439cfbaf7f3 100644
--- a/resource-manager/orbital/2022-11-01/contactprofile/predicates.go
+++ b/resource-manager/orbital/2022-11-01/contactprofile/predicates.go
@@ -12,7 +12,7 @@ type ContactProfileOperationPredicate struct {
 
 func (p ContactProfileOperationPredicate) Matches(input ContactProfile) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ContactProfileOperationPredicate) Matches(input ContactProfile) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/orbital/2022-11-01/groundstation/predicates.go b/resource-manager/orbital/2022-11-01/groundstation/predicates.go
index 2e49f722062..7a9d15cb751 100644
--- a/resource-manager/orbital/2022-11-01/groundstation/predicates.go
+++ b/resource-manager/orbital/2022-11-01/groundstation/predicates.go
@@ -12,19 +12,19 @@ type AvailableGroundStationOperationPredicate struct {
 
 func (p AvailableGroundStationOperationPredicate) Matches(input AvailableGroundStation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/orbital/2022-11-01/spacecraft/predicates.go b/resource-manager/orbital/2022-11-01/spacecraft/predicates.go
index a7f29698b1c..cf817b01997 100644
--- a/resource-manager/orbital/2022-11-01/spacecraft/predicates.go
+++ b/resource-manager/orbital/2022-11-01/spacecraft/predicates.go
@@ -12,7 +12,7 @@ type SpacecraftOperationPredicate struct {
 
 func (p SpacecraftOperationPredicate) Matches(input Spacecraft) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SpacecraftOperationPredicate) Matches(input Spacecraft) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/paloaltonetworks/2022-08-29/certificateobjectglobalrulestack/predicates.go b/resource-manager/paloaltonetworks/2022-08-29/certificateobjectglobalrulestack/predicates.go
index 58e8f49fbcf..41dceea6a21 100644
--- a/resource-manager/paloaltonetworks/2022-08-29/certificateobjectglobalrulestack/predicates.go
+++ b/resource-manager/paloaltonetworks/2022-08-29/certificateobjectglobalrulestack/predicates.go
@@ -11,15 +11,15 @@ type CertificateObjectGlobalRulestackResourceOperationPredicate struct {
 
 func (p CertificateObjectGlobalRulestackResourceOperationPredicate) Matches(input CertificateObjectGlobalRulestackResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/paloaltonetworks/2022-08-29/certificateobjectlocalrulestack/predicates.go b/resource-manager/paloaltonetworks/2022-08-29/certificateobjectlocalrulestack/predicates.go
index d841a4440a9..6c8f2d29c6f 100644
--- a/resource-manager/paloaltonetworks/2022-08-29/certificateobjectlocalrulestack/predicates.go
+++ b/resource-manager/paloaltonetworks/2022-08-29/certificateobjectlocalrulestack/predicates.go
@@ -11,15 +11,15 @@ type CertificateObjectLocalRulestackResourceOperationPredicate struct {
 
 func (p CertificateObjectLocalRulestackResourceOperationPredicate) Matches(input CertificateObjectLocalRulestackResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/paloaltonetworks/2022-08-29/firewalls/predicates.go b/resource-manager/paloaltonetworks/2022-08-29/firewalls/predicates.go
index d60fd1643f0..15248c5d11c 100644
--- a/resource-manager/paloaltonetworks/2022-08-29/firewalls/predicates.go
+++ b/resource-manager/paloaltonetworks/2022-08-29/firewalls/predicates.go
@@ -12,7 +12,7 @@ type FirewallResourceOperationPredicate struct {
 
 func (p FirewallResourceOperationPredicate) Matches(input FirewallResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p FirewallResourceOperationPredicate) Matches(input FirewallResource) bool
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/paloaltonetworks/2022-08-29/firewallstatus/predicates.go b/resource-manager/paloaltonetworks/2022-08-29/firewallstatus/predicates.go
index 8866d1e9242..e70bd94a94b 100644
--- a/resource-manager/paloaltonetworks/2022-08-29/firewallstatus/predicates.go
+++ b/resource-manager/paloaltonetworks/2022-08-29/firewallstatus/predicates.go
@@ -11,15 +11,15 @@ type FirewallStatusResourceOperationPredicate struct {
 
 func (p FirewallStatusResourceOperationPredicate) Matches(input FirewallStatusResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/paloaltonetworks/2022-08-29/fqdnlistglobalrulestack/predicates.go b/resource-manager/paloaltonetworks/2022-08-29/fqdnlistglobalrulestack/predicates.go
index 6cb85e1fed2..7c9fa1506f7 100644
--- a/resource-manager/paloaltonetworks/2022-08-29/fqdnlistglobalrulestack/predicates.go
+++ b/resource-manager/paloaltonetworks/2022-08-29/fqdnlistglobalrulestack/predicates.go
@@ -11,15 +11,15 @@ type FqdnListGlobalRulestackResourceOperationPredicate struct {
 
 func (p FqdnListGlobalRulestackResourceOperationPredicate) Matches(input FqdnListGlobalRulestackResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/paloaltonetworks/2022-08-29/fqdnlistlocalrulestack/predicates.go b/resource-manager/paloaltonetworks/2022-08-29/fqdnlistlocalrulestack/predicates.go
index e12861661b7..577c388b424 100644
--- a/resource-manager/paloaltonetworks/2022-08-29/fqdnlistlocalrulestack/predicates.go
+++ b/resource-manager/paloaltonetworks/2022-08-29/fqdnlistlocalrulestack/predicates.go
@@ -11,15 +11,15 @@ type FqdnListLocalRulestackResourceOperationPredicate struct {
 
 func (p FqdnListLocalRulestackResourceOperationPredicate) Matches(input FqdnListLocalRulestackResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/paloaltonetworks/2022-08-29/globalrulestack/predicates.go b/resource-manager/paloaltonetworks/2022-08-29/globalrulestack/predicates.go
index 1c218db76d2..4def7f37ff9 100644
--- a/resource-manager/paloaltonetworks/2022-08-29/globalrulestack/predicates.go
+++ b/resource-manager/paloaltonetworks/2022-08-29/globalrulestack/predicates.go
@@ -12,7 +12,7 @@ type GlobalRulestackResourceOperationPredicate struct {
 
 func (p GlobalRulestackResourceOperationPredicate) Matches(input GlobalRulestackResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p GlobalRulestackResourceOperationPredicate) Matches(input GlobalRulestack
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/paloaltonetworks/2022-08-29/localrules/predicates.go b/resource-manager/paloaltonetworks/2022-08-29/localrules/predicates.go
index 95f2e81c796..477a6545c11 100644
--- a/resource-manager/paloaltonetworks/2022-08-29/localrules/predicates.go
+++ b/resource-manager/paloaltonetworks/2022-08-29/localrules/predicates.go
@@ -11,15 +11,15 @@ type LocalRulesResourceOperationPredicate struct {
 
 func (p LocalRulesResourceOperationPredicate) Matches(input LocalRulesResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/paloaltonetworks/2022-08-29/localrulestacks/predicates.go b/resource-manager/paloaltonetworks/2022-08-29/localrulestacks/predicates.go
index 1b3bc8fb284..cd3ed0fbd13 100644
--- a/resource-manager/paloaltonetworks/2022-08-29/localrulestacks/predicates.go
+++ b/resource-manager/paloaltonetworks/2022-08-29/localrulestacks/predicates.go
@@ -12,7 +12,7 @@ type LocalRulestackResourceOperationPredicate struct {
 
 func (p LocalRulestackResourceOperationPredicate) Matches(input LocalRulestackResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p LocalRulestackResourceOperationPredicate) Matches(input LocalRulestackRe
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/paloaltonetworks/2022-08-29/postrules/predicates.go b/resource-manager/paloaltonetworks/2022-08-29/postrules/predicates.go
index 62da588344f..c251aa98551 100644
--- a/resource-manager/paloaltonetworks/2022-08-29/postrules/predicates.go
+++ b/resource-manager/paloaltonetworks/2022-08-29/postrules/predicates.go
@@ -11,15 +11,15 @@ type PostRulesResourceOperationPredicate struct {
 
 func (p PostRulesResourceOperationPredicate) Matches(input PostRulesResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/paloaltonetworks/2022-08-29/prefixlistglobalrulestack/predicates.go b/resource-manager/paloaltonetworks/2022-08-29/prefixlistglobalrulestack/predicates.go
index cf1887f1888..5daaa8f7a7f 100644
--- a/resource-manager/paloaltonetworks/2022-08-29/prefixlistglobalrulestack/predicates.go
+++ b/resource-manager/paloaltonetworks/2022-08-29/prefixlistglobalrulestack/predicates.go
@@ -11,15 +11,15 @@ type PrefixListGlobalRulestackResourceOperationPredicate struct {
 
 func (p PrefixListGlobalRulestackResourceOperationPredicate) Matches(input PrefixListGlobalRulestackResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/paloaltonetworks/2022-08-29/prefixlistlocalrulestack/predicates.go b/resource-manager/paloaltonetworks/2022-08-29/prefixlistlocalrulestack/predicates.go
index 55c09870651..904a372b65d 100644
--- a/resource-manager/paloaltonetworks/2022-08-29/prefixlistlocalrulestack/predicates.go
+++ b/resource-manager/paloaltonetworks/2022-08-29/prefixlistlocalrulestack/predicates.go
@@ -11,15 +11,15 @@ type PrefixListResourceOperationPredicate struct {
 
 func (p PrefixListResourceOperationPredicate) Matches(input PrefixListResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/paloaltonetworks/2022-08-29/prerules/predicates.go b/resource-manager/paloaltonetworks/2022-08-29/prerules/predicates.go
index 15d43319d8a..9fdb49209be 100644
--- a/resource-manager/paloaltonetworks/2022-08-29/prerules/predicates.go
+++ b/resource-manager/paloaltonetworks/2022-08-29/prerules/predicates.go
@@ -11,15 +11,15 @@ type PreRulesResourceOperationPredicate struct {
 
 func (p PreRulesResourceOperationPredicate) Matches(input PreRulesResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/policyinsights/2021-10-01/remediations/predicates.go b/resource-manager/policyinsights/2021-10-01/remediations/predicates.go
index 319e7c1d29f..db9f8d3867f 100644
--- a/resource-manager/policyinsights/2021-10-01/remediations/predicates.go
+++ b/resource-manager/policyinsights/2021-10-01/remediations/predicates.go
@@ -11,15 +11,15 @@ type RemediationOperationPredicate struct {
 
 func (p RemediationOperationPredicate) Matches(input Remediation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -37,27 +37,27 @@ type RemediationDeploymentOperationPredicate struct {
 
 func (p RemediationDeploymentOperationPredicate) Matches(input RemediationDeployment) bool {
 
-	if p.CreatedOn != nil && (input.CreatedOn == nil && *p.CreatedOn != *input.CreatedOn) {
+	if p.CreatedOn != nil && (input.CreatedOn == nil || *p.CreatedOn != *input.CreatedOn) {
 		return false
 	}
 
-	if p.DeploymentId != nil && (input.DeploymentId == nil && *p.DeploymentId != *input.DeploymentId) {
+	if p.DeploymentId != nil && (input.DeploymentId == nil || *p.DeploymentId != *input.DeploymentId) {
 		return false
 	}
 
-	if p.LastUpdatedOn != nil && (input.LastUpdatedOn == nil && *p.LastUpdatedOn != *input.LastUpdatedOn) {
+	if p.LastUpdatedOn != nil && (input.LastUpdatedOn == nil || *p.LastUpdatedOn != *input.LastUpdatedOn) {
 		return false
 	}
 
-	if p.RemediatedResourceId != nil && (input.RemediatedResourceId == nil && *p.RemediatedResourceId != *input.RemediatedResourceId) {
+	if p.RemediatedResourceId != nil && (input.RemediatedResourceId == nil || *p.RemediatedResourceId != *input.RemediatedResourceId) {
 		return false
 	}
 
-	if p.ResourceLocation != nil && (input.ResourceLocation == nil && *p.ResourceLocation != *input.ResourceLocation) {
+	if p.ResourceLocation != nil && (input.ResourceLocation == nil || *p.ResourceLocation != *input.ResourceLocation) {
 		return false
 	}
 
-	if p.Status != nil && (input.Status == nil && *p.Status != *input.Status) {
+	if p.Status != nil && (input.Status == nil || *p.Status != *input.Status) {
 		return false
 	}
 
diff --git a/resource-manager/policyinsights/2022-09-01/attestations/predicates.go b/resource-manager/policyinsights/2022-09-01/attestations/predicates.go
index 2f2910734e5..cec5a9985ee 100644
--- a/resource-manager/policyinsights/2022-09-01/attestations/predicates.go
+++ b/resource-manager/policyinsights/2022-09-01/attestations/predicates.go
@@ -11,15 +11,15 @@ type AttestationOperationPredicate struct {
 
 func (p AttestationOperationPredicate) Matches(input Attestation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/portal/2019-01-01-preview/dashboard/predicates.go b/resource-manager/portal/2019-01-01-preview/dashboard/predicates.go
index 5df2eed46ce..c4b99fa717f 100644
--- a/resource-manager/portal/2019-01-01-preview/dashboard/predicates.go
+++ b/resource-manager/portal/2019-01-01-preview/dashboard/predicates.go
@@ -12,7 +12,7 @@ type DashboardOperationPredicate struct {
 
 func (p DashboardOperationPredicate) Matches(input Dashboard) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p DashboardOperationPredicate) Matches(input Dashboard) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2017-12-01/serversecurityalertpolicies/predicates.go b/resource-manager/postgresql/2017-12-01/serversecurityalertpolicies/predicates.go
index ac6768d8eb2..ff213a5f292 100644
--- a/resource-manager/postgresql/2017-12-01/serversecurityalertpolicies/predicates.go
+++ b/resource-manager/postgresql/2017-12-01/serversecurityalertpolicies/predicates.go
@@ -11,15 +11,15 @@ type ServerSecurityAlertPolicyOperationPredicate struct {
 
 func (p ServerSecurityAlertPolicyOperationPredicate) Matches(input ServerSecurityAlertPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2017-12-01/virtualnetworkrules/predicates.go b/resource-manager/postgresql/2017-12-01/virtualnetworkrules/predicates.go
index 3050c3d8f64..9170201b8d5 100644
--- a/resource-manager/postgresql/2017-12-01/virtualnetworkrules/predicates.go
+++ b/resource-manager/postgresql/2017-12-01/virtualnetworkrules/predicates.go
@@ -11,15 +11,15 @@ type VirtualNetworkRuleOperationPredicate struct {
 
 func (p VirtualNetworkRuleOperationPredicate) Matches(input VirtualNetworkRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2018-06-01/advisors/predicates.go b/resource-manager/postgresql/2018-06-01/advisors/predicates.go
index 2ae3a8b9d7e..81f564400a6 100644
--- a/resource-manager/postgresql/2018-06-01/advisors/predicates.go
+++ b/resource-manager/postgresql/2018-06-01/advisors/predicates.go
@@ -12,19 +12,19 @@ type AdvisorOperationPredicate struct {
 
 func (p AdvisorOperationPredicate) Matches(input Advisor) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Properties != nil && (input.Properties == nil && *p.Properties != *input.Properties) {
+	if p.Properties != nil && (input.Properties == nil || *p.Properties != *input.Properties) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2018-06-01/locationbasedrecommendedactionsessionsresult/predicates.go b/resource-manager/postgresql/2018-06-01/locationbasedrecommendedactionsessionsresult/predicates.go
index 77d8b8b914b..8d0b9f4c5a1 100644
--- a/resource-manager/postgresql/2018-06-01/locationbasedrecommendedactionsessionsresult/predicates.go
+++ b/resource-manager/postgresql/2018-06-01/locationbasedrecommendedactionsessionsresult/predicates.go
@@ -11,15 +11,15 @@ type RecommendationActionOperationPredicate struct {
 
 func (p RecommendationActionOperationPredicate) Matches(input RecommendationAction) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2018-06-01/privateendpointconnections/predicates.go b/resource-manager/postgresql/2018-06-01/privateendpointconnections/predicates.go
index bea3f66b397..4a03a91ce52 100644
--- a/resource-manager/postgresql/2018-06-01/privateendpointconnections/predicates.go
+++ b/resource-manager/postgresql/2018-06-01/privateendpointconnections/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2018-06-01/privatelinkresources/predicates.go b/resource-manager/postgresql/2018-06-01/privatelinkresources/predicates.go
index 29d787f073a..19b771c3994 100644
--- a/resource-manager/postgresql/2018-06-01/privatelinkresources/predicates.go
+++ b/resource-manager/postgresql/2018-06-01/privatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2018-06-01/querytexts/predicates.go b/resource-manager/postgresql/2018-06-01/querytexts/predicates.go
index 18c87efd56c..8469f83ed41 100644
--- a/resource-manager/postgresql/2018-06-01/querytexts/predicates.go
+++ b/resource-manager/postgresql/2018-06-01/querytexts/predicates.go
@@ -11,15 +11,15 @@ type QueryTextOperationPredicate struct {
 
 func (p QueryTextOperationPredicate) Matches(input QueryText) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2018-06-01/recommendedactions/predicates.go b/resource-manager/postgresql/2018-06-01/recommendedactions/predicates.go
index 6b473c28dea..8e28466d19b 100644
--- a/resource-manager/postgresql/2018-06-01/recommendedactions/predicates.go
+++ b/resource-manager/postgresql/2018-06-01/recommendedactions/predicates.go
@@ -11,15 +11,15 @@ type RecommendationActionOperationPredicate struct {
 
 func (p RecommendationActionOperationPredicate) Matches(input RecommendationAction) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2018-06-01/topquerystatistics/predicates.go b/resource-manager/postgresql/2018-06-01/topquerystatistics/predicates.go
index 2048510f797..c853f547691 100644
--- a/resource-manager/postgresql/2018-06-01/topquerystatistics/predicates.go
+++ b/resource-manager/postgresql/2018-06-01/topquerystatistics/predicates.go
@@ -11,15 +11,15 @@ type QueryStatisticOperationPredicate struct {
 
 func (p QueryStatisticOperationPredicate) Matches(input QueryStatistic) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2018-06-01/waitstatistics/predicates.go b/resource-manager/postgresql/2018-06-01/waitstatistics/predicates.go
index 6c6cc2d05b9..9fe1b39cb11 100644
--- a/resource-manager/postgresql/2018-06-01/waitstatistics/predicates.go
+++ b/resource-manager/postgresql/2018-06-01/waitstatistics/predicates.go
@@ -11,15 +11,15 @@ type WaitStatisticOperationPredicate struct {
 
 func (p WaitStatisticOperationPredicate) Matches(input WaitStatistic) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2020-01-01/serverkeys/predicates.go b/resource-manager/postgresql/2020-01-01/serverkeys/predicates.go
index bd48edfcca8..0946941bd87 100644
--- a/resource-manager/postgresql/2020-01-01/serverkeys/predicates.go
+++ b/resource-manager/postgresql/2020-01-01/serverkeys/predicates.go
@@ -12,19 +12,19 @@ type ServerKeyOperationPredicate struct {
 
 func (p ServerKeyOperationPredicate) Matches(input ServerKey) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2021-06-01/configurations/predicates.go b/resource-manager/postgresql/2021-06-01/configurations/predicates.go
index 4e755074739..4ff843ebaef 100644
--- a/resource-manager/postgresql/2021-06-01/configurations/predicates.go
+++ b/resource-manager/postgresql/2021-06-01/configurations/predicates.go
@@ -11,15 +11,15 @@ type ConfigurationOperationPredicate struct {
 
 func (p ConfigurationOperationPredicate) Matches(input Configuration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2021-06-01/databases/predicates.go b/resource-manager/postgresql/2021-06-01/databases/predicates.go
index 76a8d6409f3..3d55136d0fb 100644
--- a/resource-manager/postgresql/2021-06-01/databases/predicates.go
+++ b/resource-manager/postgresql/2021-06-01/databases/predicates.go
@@ -11,15 +11,15 @@ type DatabaseOperationPredicate struct {
 
 func (p DatabaseOperationPredicate) Matches(input Database) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2021-06-01/firewallrules/predicates.go b/resource-manager/postgresql/2021-06-01/firewallrules/predicates.go
index 1c6d22830c2..fb7011b1d3b 100644
--- a/resource-manager/postgresql/2021-06-01/firewallrules/predicates.go
+++ b/resource-manager/postgresql/2021-06-01/firewallrules/predicates.go
@@ -11,15 +11,15 @@ type FirewallRuleOperationPredicate struct {
 
 func (p FirewallRuleOperationPredicate) Matches(input FirewallRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2021-06-01/locationbasedcapabilities/predicates.go b/resource-manager/postgresql/2021-06-01/locationbasedcapabilities/predicates.go
index 91c0e8ba82b..b97c8e04c3c 100644
--- a/resource-manager/postgresql/2021-06-01/locationbasedcapabilities/predicates.go
+++ b/resource-manager/postgresql/2021-06-01/locationbasedcapabilities/predicates.go
@@ -12,19 +12,19 @@ type CapabilityPropertiesOperationPredicate struct {
 
 func (p CapabilityPropertiesOperationPredicate) Matches(input CapabilityProperties) bool {
 
-	if p.GeoBackupSupported != nil && (input.GeoBackupSupported == nil && *p.GeoBackupSupported != *input.GeoBackupSupported) {
+	if p.GeoBackupSupported != nil && (input.GeoBackupSupported == nil || *p.GeoBackupSupported != *input.GeoBackupSupported) {
 		return false
 	}
 
-	if p.Status != nil && (input.Status == nil && *p.Status != *input.Status) {
+	if p.Status != nil && (input.Status == nil || *p.Status != *input.Status) {
 		return false
 	}
 
-	if p.ZoneRedundantHaAndGeoBackupSupported != nil && (input.ZoneRedundantHaAndGeoBackupSupported == nil && *p.ZoneRedundantHaAndGeoBackupSupported != *input.ZoneRedundantHaAndGeoBackupSupported) {
+	if p.ZoneRedundantHaAndGeoBackupSupported != nil && (input.ZoneRedundantHaAndGeoBackupSupported == nil || *p.ZoneRedundantHaAndGeoBackupSupported != *input.ZoneRedundantHaAndGeoBackupSupported) {
 		return false
 	}
 
-	if p.ZoneRedundantHaSupported != nil && (input.ZoneRedundantHaSupported == nil && *p.ZoneRedundantHaSupported != *input.ZoneRedundantHaSupported) {
+	if p.ZoneRedundantHaSupported != nil && (input.ZoneRedundantHaSupported == nil || *p.ZoneRedundantHaSupported != *input.ZoneRedundantHaSupported) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2021-06-01/servers/predicates.go b/resource-manager/postgresql/2021-06-01/servers/predicates.go
index 9cb84cf6466..8b49f30ccbe 100644
--- a/resource-manager/postgresql/2021-06-01/servers/predicates.go
+++ b/resource-manager/postgresql/2021-06-01/servers/predicates.go
@@ -12,7 +12,7 @@ type ServerOperationPredicate struct {
 
 func (p ServerOperationPredicate) Matches(input Server) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ServerOperationPredicate) Matches(input Server) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2022-03-08-preview/administrators/predicates.go b/resource-manager/postgresql/2022-03-08-preview/administrators/predicates.go
index ec36f0ea618..66918ad7784 100644
--- a/resource-manager/postgresql/2022-03-08-preview/administrators/predicates.go
+++ b/resource-manager/postgresql/2022-03-08-preview/administrators/predicates.go
@@ -11,15 +11,15 @@ type ActiveDirectoryAdministratorOperationPredicate struct {
 
 func (p ActiveDirectoryAdministratorOperationPredicate) Matches(input ActiveDirectoryAdministrator) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2022-03-08-preview/backups/predicates.go b/resource-manager/postgresql/2022-03-08-preview/backups/predicates.go
index cf0ae2ed13b..8dd0c0c5c20 100644
--- a/resource-manager/postgresql/2022-03-08-preview/backups/predicates.go
+++ b/resource-manager/postgresql/2022-03-08-preview/backups/predicates.go
@@ -11,15 +11,15 @@ type ServerBackupOperationPredicate struct {
 
 func (p ServerBackupOperationPredicate) Matches(input ServerBackup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2022-03-08-preview/configurations/predicates.go b/resource-manager/postgresql/2022-03-08-preview/configurations/predicates.go
index 4e755074739..4ff843ebaef 100644
--- a/resource-manager/postgresql/2022-03-08-preview/configurations/predicates.go
+++ b/resource-manager/postgresql/2022-03-08-preview/configurations/predicates.go
@@ -11,15 +11,15 @@ type ConfigurationOperationPredicate struct {
 
 func (p ConfigurationOperationPredicate) Matches(input Configuration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2022-03-08-preview/databases/predicates.go b/resource-manager/postgresql/2022-03-08-preview/databases/predicates.go
index 76a8d6409f3..3d55136d0fb 100644
--- a/resource-manager/postgresql/2022-03-08-preview/databases/predicates.go
+++ b/resource-manager/postgresql/2022-03-08-preview/databases/predicates.go
@@ -11,15 +11,15 @@ type DatabaseOperationPredicate struct {
 
 func (p DatabaseOperationPredicate) Matches(input Database) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2022-03-08-preview/firewallrules/predicates.go b/resource-manager/postgresql/2022-03-08-preview/firewallrules/predicates.go
index 1c6d22830c2..fb7011b1d3b 100644
--- a/resource-manager/postgresql/2022-03-08-preview/firewallrules/predicates.go
+++ b/resource-manager/postgresql/2022-03-08-preview/firewallrules/predicates.go
@@ -11,15 +11,15 @@ type FirewallRuleOperationPredicate struct {
 
 func (p FirewallRuleOperationPredicate) Matches(input FirewallRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2022-03-08-preview/locationbasedcapabilities/predicates.go b/resource-manager/postgresql/2022-03-08-preview/locationbasedcapabilities/predicates.go
index 786cbea8810..b831b6d8f37 100644
--- a/resource-manager/postgresql/2022-03-08-preview/locationbasedcapabilities/predicates.go
+++ b/resource-manager/postgresql/2022-03-08-preview/locationbasedcapabilities/predicates.go
@@ -13,23 +13,23 @@ type CapabilityPropertiesOperationPredicate struct {
 
 func (p CapabilityPropertiesOperationPredicate) Matches(input CapabilityProperties) bool {
 
-	if p.FastProvisioningSupported != nil && (input.FastProvisioningSupported == nil && *p.FastProvisioningSupported != *input.FastProvisioningSupported) {
+	if p.FastProvisioningSupported != nil && (input.FastProvisioningSupported == nil || *p.FastProvisioningSupported != *input.FastProvisioningSupported) {
 		return false
 	}
 
-	if p.GeoBackupSupported != nil && (input.GeoBackupSupported == nil && *p.GeoBackupSupported != *input.GeoBackupSupported) {
+	if p.GeoBackupSupported != nil && (input.GeoBackupSupported == nil || *p.GeoBackupSupported != *input.GeoBackupSupported) {
 		return false
 	}
 
-	if p.Status != nil && (input.Status == nil && *p.Status != *input.Status) {
+	if p.Status != nil && (input.Status == nil || *p.Status != *input.Status) {
 		return false
 	}
 
-	if p.ZoneRedundantHaAndGeoBackupSupported != nil && (input.ZoneRedundantHaAndGeoBackupSupported == nil && *p.ZoneRedundantHaAndGeoBackupSupported != *input.ZoneRedundantHaAndGeoBackupSupported) {
+	if p.ZoneRedundantHaAndGeoBackupSupported != nil && (input.ZoneRedundantHaAndGeoBackupSupported == nil || *p.ZoneRedundantHaAndGeoBackupSupported != *input.ZoneRedundantHaAndGeoBackupSupported) {
 		return false
 	}
 
-	if p.ZoneRedundantHaSupported != nil && (input.ZoneRedundantHaSupported == nil && *p.ZoneRedundantHaSupported != *input.ZoneRedundantHaSupported) {
+	if p.ZoneRedundantHaSupported != nil && (input.ZoneRedundantHaSupported == nil || *p.ZoneRedundantHaSupported != *input.ZoneRedundantHaSupported) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2022-03-08-preview/servers/predicates.go b/resource-manager/postgresql/2022-03-08-preview/servers/predicates.go
index 9cb84cf6466..8b49f30ccbe 100644
--- a/resource-manager/postgresql/2022-03-08-preview/servers/predicates.go
+++ b/resource-manager/postgresql/2022-03-08-preview/servers/predicates.go
@@ -12,7 +12,7 @@ type ServerOperationPredicate struct {
 
 func (p ServerOperationPredicate) Matches(input Server) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ServerOperationPredicate) Matches(input Server) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2022-12-01/administrators/predicates.go b/resource-manager/postgresql/2022-12-01/administrators/predicates.go
index ec36f0ea618..66918ad7784 100644
--- a/resource-manager/postgresql/2022-12-01/administrators/predicates.go
+++ b/resource-manager/postgresql/2022-12-01/administrators/predicates.go
@@ -11,15 +11,15 @@ type ActiveDirectoryAdministratorOperationPredicate struct {
 
 func (p ActiveDirectoryAdministratorOperationPredicate) Matches(input ActiveDirectoryAdministrator) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2022-12-01/backups/predicates.go b/resource-manager/postgresql/2022-12-01/backups/predicates.go
index cf0ae2ed13b..8dd0c0c5c20 100644
--- a/resource-manager/postgresql/2022-12-01/backups/predicates.go
+++ b/resource-manager/postgresql/2022-12-01/backups/predicates.go
@@ -11,15 +11,15 @@ type ServerBackupOperationPredicate struct {
 
 func (p ServerBackupOperationPredicate) Matches(input ServerBackup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2022-12-01/configurations/predicates.go b/resource-manager/postgresql/2022-12-01/configurations/predicates.go
index 4e755074739..4ff843ebaef 100644
--- a/resource-manager/postgresql/2022-12-01/configurations/predicates.go
+++ b/resource-manager/postgresql/2022-12-01/configurations/predicates.go
@@ -11,15 +11,15 @@ type ConfigurationOperationPredicate struct {
 
 func (p ConfigurationOperationPredicate) Matches(input Configuration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2022-12-01/databases/predicates.go b/resource-manager/postgresql/2022-12-01/databases/predicates.go
index 76a8d6409f3..3d55136d0fb 100644
--- a/resource-manager/postgresql/2022-12-01/databases/predicates.go
+++ b/resource-manager/postgresql/2022-12-01/databases/predicates.go
@@ -11,15 +11,15 @@ type DatabaseOperationPredicate struct {
 
 func (p DatabaseOperationPredicate) Matches(input Database) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2022-12-01/firewallrules/predicates.go b/resource-manager/postgresql/2022-12-01/firewallrules/predicates.go
index 1c6d22830c2..fb7011b1d3b 100644
--- a/resource-manager/postgresql/2022-12-01/firewallrules/predicates.go
+++ b/resource-manager/postgresql/2022-12-01/firewallrules/predicates.go
@@ -11,15 +11,15 @@ type FirewallRuleOperationPredicate struct {
 
 func (p FirewallRuleOperationPredicate) Matches(input FirewallRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2022-12-01/locationbasedcapabilities/predicates.go b/resource-manager/postgresql/2022-12-01/locationbasedcapabilities/predicates.go
index 786cbea8810..b831b6d8f37 100644
--- a/resource-manager/postgresql/2022-12-01/locationbasedcapabilities/predicates.go
+++ b/resource-manager/postgresql/2022-12-01/locationbasedcapabilities/predicates.go
@@ -13,23 +13,23 @@ type CapabilityPropertiesOperationPredicate struct {
 
 func (p CapabilityPropertiesOperationPredicate) Matches(input CapabilityProperties) bool {
 
-	if p.FastProvisioningSupported != nil && (input.FastProvisioningSupported == nil && *p.FastProvisioningSupported != *input.FastProvisioningSupported) {
+	if p.FastProvisioningSupported != nil && (input.FastProvisioningSupported == nil || *p.FastProvisioningSupported != *input.FastProvisioningSupported) {
 		return false
 	}
 
-	if p.GeoBackupSupported != nil && (input.GeoBackupSupported == nil && *p.GeoBackupSupported != *input.GeoBackupSupported) {
+	if p.GeoBackupSupported != nil && (input.GeoBackupSupported == nil || *p.GeoBackupSupported != *input.GeoBackupSupported) {
 		return false
 	}
 
-	if p.Status != nil && (input.Status == nil && *p.Status != *input.Status) {
+	if p.Status != nil && (input.Status == nil || *p.Status != *input.Status) {
 		return false
 	}
 
-	if p.ZoneRedundantHaAndGeoBackupSupported != nil && (input.ZoneRedundantHaAndGeoBackupSupported == nil && *p.ZoneRedundantHaAndGeoBackupSupported != *input.ZoneRedundantHaAndGeoBackupSupported) {
+	if p.ZoneRedundantHaAndGeoBackupSupported != nil && (input.ZoneRedundantHaAndGeoBackupSupported == nil || *p.ZoneRedundantHaAndGeoBackupSupported != *input.ZoneRedundantHaAndGeoBackupSupported) {
 		return false
 	}
 
-	if p.ZoneRedundantHaSupported != nil && (input.ZoneRedundantHaSupported == nil && *p.ZoneRedundantHaSupported != *input.ZoneRedundantHaSupported) {
+	if p.ZoneRedundantHaSupported != nil && (input.ZoneRedundantHaSupported == nil || *p.ZoneRedundantHaSupported != *input.ZoneRedundantHaSupported) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2022-12-01/servers/predicates.go b/resource-manager/postgresql/2022-12-01/servers/predicates.go
index 9cb84cf6466..8b49f30ccbe 100644
--- a/resource-manager/postgresql/2022-12-01/servers/predicates.go
+++ b/resource-manager/postgresql/2022-12-01/servers/predicates.go
@@ -12,7 +12,7 @@ type ServerOperationPredicate struct {
 
 func (p ServerOperationPredicate) Matches(input Server) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ServerOperationPredicate) Matches(input Server) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2023-03-01-preview/administrators/predicates.go b/resource-manager/postgresql/2023-03-01-preview/administrators/predicates.go
index ec36f0ea618..66918ad7784 100644
--- a/resource-manager/postgresql/2023-03-01-preview/administrators/predicates.go
+++ b/resource-manager/postgresql/2023-03-01-preview/administrators/predicates.go
@@ -11,15 +11,15 @@ type ActiveDirectoryAdministratorOperationPredicate struct {
 
 func (p ActiveDirectoryAdministratorOperationPredicate) Matches(input ActiveDirectoryAdministrator) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2023-03-01-preview/backups/predicates.go b/resource-manager/postgresql/2023-03-01-preview/backups/predicates.go
index cf0ae2ed13b..8dd0c0c5c20 100644
--- a/resource-manager/postgresql/2023-03-01-preview/backups/predicates.go
+++ b/resource-manager/postgresql/2023-03-01-preview/backups/predicates.go
@@ -11,15 +11,15 @@ type ServerBackupOperationPredicate struct {
 
 func (p ServerBackupOperationPredicate) Matches(input ServerBackup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2023-03-01-preview/configurations/predicates.go b/resource-manager/postgresql/2023-03-01-preview/configurations/predicates.go
index 4e755074739..4ff843ebaef 100644
--- a/resource-manager/postgresql/2023-03-01-preview/configurations/predicates.go
+++ b/resource-manager/postgresql/2023-03-01-preview/configurations/predicates.go
@@ -11,15 +11,15 @@ type ConfigurationOperationPredicate struct {
 
 func (p ConfigurationOperationPredicate) Matches(input Configuration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2023-03-01-preview/databases/predicates.go b/resource-manager/postgresql/2023-03-01-preview/databases/predicates.go
index 76a8d6409f3..3d55136d0fb 100644
--- a/resource-manager/postgresql/2023-03-01-preview/databases/predicates.go
+++ b/resource-manager/postgresql/2023-03-01-preview/databases/predicates.go
@@ -11,15 +11,15 @@ type DatabaseOperationPredicate struct {
 
 func (p DatabaseOperationPredicate) Matches(input Database) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2023-03-01-preview/firewallrules/predicates.go b/resource-manager/postgresql/2023-03-01-preview/firewallrules/predicates.go
index 1c6d22830c2..fb7011b1d3b 100644
--- a/resource-manager/postgresql/2023-03-01-preview/firewallrules/predicates.go
+++ b/resource-manager/postgresql/2023-03-01-preview/firewallrules/predicates.go
@@ -11,15 +11,15 @@ type FirewallRuleOperationPredicate struct {
 
 func (p FirewallRuleOperationPredicate) Matches(input FirewallRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2023-03-01-preview/flexibleservercapabilities/predicates.go b/resource-manager/postgresql/2023-03-01-preview/flexibleservercapabilities/predicates.go
index 78c6f80fa2a..4039d4e5aff 100644
--- a/resource-manager/postgresql/2023-03-01-preview/flexibleservercapabilities/predicates.go
+++ b/resource-manager/postgresql/2023-03-01-preview/flexibleservercapabilities/predicates.go
@@ -10,11 +10,11 @@ type FlexibleServerCapabilityOperationPredicate struct {
 
 func (p FlexibleServerCapabilityOperationPredicate) Matches(input FlexibleServerCapability) bool {
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Reason != nil && (input.Reason == nil && *p.Reason != *input.Reason) {
+	if p.Reason != nil && (input.Reason == nil || *p.Reason != *input.Reason) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2023-03-01-preview/locationbasedcapabilities/predicates.go b/resource-manager/postgresql/2023-03-01-preview/locationbasedcapabilities/predicates.go
index 01bcd8abb16..d1ea2a3ec43 100644
--- a/resource-manager/postgresql/2023-03-01-preview/locationbasedcapabilities/predicates.go
+++ b/resource-manager/postgresql/2023-03-01-preview/locationbasedcapabilities/predicates.go
@@ -10,11 +10,11 @@ type FlexibleServerCapabilityOperationPredicate struct {
 
 func (p FlexibleServerCapabilityOperationPredicate) Matches(input FlexibleServerCapability) bool {
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Reason != nil && (input.Reason == nil && *p.Reason != *input.Reason) {
+	if p.Reason != nil && (input.Reason == nil || *p.Reason != *input.Reason) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2023-03-01-preview/logfiles/predicates.go b/resource-manager/postgresql/2023-03-01-preview/logfiles/predicates.go
index dda1da1cf44..3b4f9690c5d 100644
--- a/resource-manager/postgresql/2023-03-01-preview/logfiles/predicates.go
+++ b/resource-manager/postgresql/2023-03-01-preview/logfiles/predicates.go
@@ -11,15 +11,15 @@ type LogFileOperationPredicate struct {
 
 func (p LogFileOperationPredicate) Matches(input LogFile) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2023-03-01-preview/longtermretentionbackup/predicates.go b/resource-manager/postgresql/2023-03-01-preview/longtermretentionbackup/predicates.go
index 366707f2496..8320b506dfc 100644
--- a/resource-manager/postgresql/2023-03-01-preview/longtermretentionbackup/predicates.go
+++ b/resource-manager/postgresql/2023-03-01-preview/longtermretentionbackup/predicates.go
@@ -19,7 +19,7 @@ func (p LtrServerBackupOperationOperationPredicate) Matches(input LtrServerBacku
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2023-03-01-preview/migrations/predicates.go b/resource-manager/postgresql/2023-03-01-preview/migrations/predicates.go
index 675a3680c1d..b9eb451a481 100644
--- a/resource-manager/postgresql/2023-03-01-preview/migrations/predicates.go
+++ b/resource-manager/postgresql/2023-03-01-preview/migrations/predicates.go
@@ -12,7 +12,7 @@ type MigrationResourceOperationPredicate struct {
 
 func (p MigrationResourceOperationPredicate) Matches(input MigrationResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p MigrationResourceOperationPredicate) Matches(input MigrationResource) bo
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresql/2023-03-01-preview/servers/predicates.go b/resource-manager/postgresql/2023-03-01-preview/servers/predicates.go
index 9cb84cf6466..8b49f30ccbe 100644
--- a/resource-manager/postgresql/2023-03-01-preview/servers/predicates.go
+++ b/resource-manager/postgresql/2023-03-01-preview/servers/predicates.go
@@ -12,7 +12,7 @@ type ServerOperationPredicate struct {
 
 func (p ServerOperationPredicate) Matches(input Server) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ServerOperationPredicate) Matches(input Server) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresqlhsc/2020-10-05-privatepreview/configurations/predicates.go b/resource-manager/postgresqlhsc/2020-10-05-privatepreview/configurations/predicates.go
index 550778c1c0b..09b85ed4cb7 100644
--- a/resource-manager/postgresqlhsc/2020-10-05-privatepreview/configurations/predicates.go
+++ b/resource-manager/postgresqlhsc/2020-10-05-privatepreview/configurations/predicates.go
@@ -11,15 +11,15 @@ type ServerConfigurationOperationPredicate struct {
 
 func (p ServerConfigurationOperationPredicate) Matches(input ServerConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type ServerGroupConfigurationOperationPredicate struct {
 
 func (p ServerGroupConfigurationOperationPredicate) Matches(input ServerGroupConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresqlhsc/2020-10-05-privatepreview/servergroups/predicates.go b/resource-manager/postgresqlhsc/2020-10-05-privatepreview/servergroups/predicates.go
index f115d103404..f25a7708385 100644
--- a/resource-manager/postgresqlhsc/2020-10-05-privatepreview/servergroups/predicates.go
+++ b/resource-manager/postgresqlhsc/2020-10-05-privatepreview/servergroups/predicates.go
@@ -12,7 +12,7 @@ type ServerGroupOperationPredicate struct {
 
 func (p ServerGroupOperationPredicate) Matches(input ServerGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ServerGroupOperationPredicate) Matches(input ServerGroup) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresqlhsc/2022-11-08/clusters/predicates.go b/resource-manager/postgresqlhsc/2022-11-08/clusters/predicates.go
index 7c9c4692854..cc13b7c6220 100644
--- a/resource-manager/postgresqlhsc/2022-11-08/clusters/predicates.go
+++ b/resource-manager/postgresqlhsc/2022-11-08/clusters/predicates.go
@@ -12,7 +12,7 @@ type ClusterOperationPredicate struct {
 
 func (p ClusterOperationPredicate) Matches(input Cluster) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ClusterOperationPredicate) Matches(input Cluster) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/postgresqlhsc/2022-11-08/configurations/predicates.go b/resource-manager/postgresqlhsc/2022-11-08/configurations/predicates.go
index 49a5c8012e1..ffb4a87788f 100644
--- a/resource-manager/postgresqlhsc/2022-11-08/configurations/predicates.go
+++ b/resource-manager/postgresqlhsc/2022-11-08/configurations/predicates.go
@@ -11,15 +11,15 @@ type ConfigurationOperationPredicate struct {
 
 func (p ConfigurationOperationPredicate) Matches(input Configuration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type ServerConfigurationOperationPredicate struct {
 
 func (p ServerConfigurationOperationPredicate) Matches(input ServerConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/privatedns/2020-06-01/privatezones/predicates.go b/resource-manager/privatedns/2020-06-01/privatezones/predicates.go
index 788a6f93310..5c765bcc300 100644
--- a/resource-manager/privatedns/2020-06-01/privatezones/predicates.go
+++ b/resource-manager/privatedns/2020-06-01/privatezones/predicates.go
@@ -13,23 +13,23 @@ type PrivateZoneOperationPredicate struct {
 
 func (p PrivateZoneOperationPredicate) Matches(input PrivateZone) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/privatedns/2020-06-01/recordsets/predicates.go b/resource-manager/privatedns/2020-06-01/recordsets/predicates.go
index 3b614565bd9..d8c25e0e1ba 100644
--- a/resource-manager/privatedns/2020-06-01/recordsets/predicates.go
+++ b/resource-manager/privatedns/2020-06-01/recordsets/predicates.go
@@ -12,19 +12,19 @@ type RecordSetOperationPredicate struct {
 
 func (p RecordSetOperationPredicate) Matches(input RecordSet) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/privatedns/2020-06-01/virtualnetworklinks/predicates.go b/resource-manager/privatedns/2020-06-01/virtualnetworklinks/predicates.go
index c8e921ba7ed..2c16f4badc5 100644
--- a/resource-manager/privatedns/2020-06-01/virtualnetworklinks/predicates.go
+++ b/resource-manager/privatedns/2020-06-01/virtualnetworklinks/predicates.go
@@ -13,23 +13,23 @@ type VirtualNetworkLinkOperationPredicate struct {
 
 func (p VirtualNetworkLinkOperationPredicate) Matches(input VirtualNetworkLink) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/purview/2021-07-01/account/predicates.go b/resource-manager/purview/2021-07-01/account/predicates.go
index 3796cfad2e4..c71ce792507 100644
--- a/resource-manager/purview/2021-07-01/account/predicates.go
+++ b/resource-manager/purview/2021-07-01/account/predicates.go
@@ -12,19 +12,19 @@ type AccountOperationPredicate struct {
 
 func (p AccountOperationPredicate) Matches(input Account) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/purview/2021-07-01/privateendpointconnection/predicates.go b/resource-manager/purview/2021-07-01/privateendpointconnection/predicates.go
index 15cbf456024..ed0e5025416 100644
--- a/resource-manager/purview/2021-07-01/privateendpointconnection/predicates.go
+++ b/resource-manager/purview/2021-07-01/privateendpointconnection/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/purview/2021-07-01/privatelinkresource/predicates.go b/resource-manager/purview/2021-07-01/privatelinkresource/predicates.go
index 3455b0100fb..3392e26881e 100644
--- a/resource-manager/purview/2021-07-01/privatelinkresource/predicates.go
+++ b/resource-manager/purview/2021-07-01/privatelinkresource/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/purview/2021-12-01/account/predicates.go b/resource-manager/purview/2021-12-01/account/predicates.go
index 3796cfad2e4..c71ce792507 100644
--- a/resource-manager/purview/2021-12-01/account/predicates.go
+++ b/resource-manager/purview/2021-12-01/account/predicates.go
@@ -12,19 +12,19 @@ type AccountOperationPredicate struct {
 
 func (p AccountOperationPredicate) Matches(input Account) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/purview/2021-12-01/kafkaconfiguration/predicates.go b/resource-manager/purview/2021-12-01/kafkaconfiguration/predicates.go
index 0840d48f2ac..319b392d87d 100644
--- a/resource-manager/purview/2021-12-01/kafkaconfiguration/predicates.go
+++ b/resource-manager/purview/2021-12-01/kafkaconfiguration/predicates.go
@@ -11,15 +11,15 @@ type KafkaConfigurationOperationPredicate struct {
 
 func (p KafkaConfigurationOperationPredicate) Matches(input KafkaConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/purview/2021-12-01/privateendpointconnection/predicates.go b/resource-manager/purview/2021-12-01/privateendpointconnection/predicates.go
index 15cbf456024..ed0e5025416 100644
--- a/resource-manager/purview/2021-12-01/privateendpointconnection/predicates.go
+++ b/resource-manager/purview/2021-12-01/privateendpointconnection/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/purview/2021-12-01/privatelinkresource/predicates.go b/resource-manager/purview/2021-12-01/privatelinkresource/predicates.go
index 3455b0100fb..3392e26881e 100644
--- a/resource-manager/purview/2021-12-01/privatelinkresource/predicates.go
+++ b/resource-manager/purview/2021-12-01/privatelinkresource/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/qumulostorage/2022-10-12/filesystems/predicates.go b/resource-manager/qumulostorage/2022-10-12/filesystems/predicates.go
index 0438c49afe4..6d053271bc4 100644
--- a/resource-manager/qumulostorage/2022-10-12/filesystems/predicates.go
+++ b/resource-manager/qumulostorage/2022-10-12/filesystems/predicates.go
@@ -12,7 +12,7 @@ type FileSystemResourceOperationPredicate struct {
 
 func (p FileSystemResourceOperationPredicate) Matches(input FileSystemResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p FileSystemResourceOperationPredicate) Matches(input FileSystemResource)
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservices/2021-08-01/listprivatelinkresources/predicates.go b/resource-manager/recoveryservices/2021-08-01/listprivatelinkresources/predicates.go
index e1b53f49241..5eb0bb91e57 100644
--- a/resource-manager/recoveryservices/2021-08-01/listprivatelinkresources/predicates.go
+++ b/resource-manager/recoveryservices/2021-08-01/listprivatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservices/2021-08-01/vaults/predicates.go b/resource-manager/recoveryservices/2021-08-01/vaults/predicates.go
index ac2524ee58a..1039a9afe4e 100644
--- a/resource-manager/recoveryservices/2021-08-01/vaults/predicates.go
+++ b/resource-manager/recoveryservices/2021-08-01/vaults/predicates.go
@@ -13,11 +13,11 @@ type VaultOperationPredicate struct {
 
 func (p VaultOperationPredicate) Matches(input Vault) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p VaultOperationPredicate) Matches(input Vault) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservices/2021-12-01/listprivatelinkresources/predicates.go b/resource-manager/recoveryservices/2021-12-01/listprivatelinkresources/predicates.go
index e1b53f49241..5eb0bb91e57 100644
--- a/resource-manager/recoveryservices/2021-12-01/listprivatelinkresources/predicates.go
+++ b/resource-manager/recoveryservices/2021-12-01/listprivatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservices/2021-12-01/vaults/predicates.go b/resource-manager/recoveryservices/2021-12-01/vaults/predicates.go
index ac2524ee58a..1039a9afe4e 100644
--- a/resource-manager/recoveryservices/2021-12-01/vaults/predicates.go
+++ b/resource-manager/recoveryservices/2021-12-01/vaults/predicates.go
@@ -13,11 +13,11 @@ type VaultOperationPredicate struct {
 
 func (p VaultOperationPredicate) Matches(input Vault) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p VaultOperationPredicate) Matches(input Vault) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservices/2022-03-01/listprivatelinkresources/predicates.go b/resource-manager/recoveryservices/2022-03-01/listprivatelinkresources/predicates.go
index e1b53f49241..5eb0bb91e57 100644
--- a/resource-manager/recoveryservices/2022-03-01/listprivatelinkresources/predicates.go
+++ b/resource-manager/recoveryservices/2022-03-01/listprivatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservices/2022-03-01/vaults/predicates.go b/resource-manager/recoveryservices/2022-03-01/vaults/predicates.go
index ac2524ee58a..1039a9afe4e 100644
--- a/resource-manager/recoveryservices/2022-03-01/vaults/predicates.go
+++ b/resource-manager/recoveryservices/2022-03-01/vaults/predicates.go
@@ -13,11 +13,11 @@ type VaultOperationPredicate struct {
 
 func (p VaultOperationPredicate) Matches(input Vault) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p VaultOperationPredicate) Matches(input Vault) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservices/2022-08-01/listprivatelinkresources/predicates.go b/resource-manager/recoveryservices/2022-08-01/listprivatelinkresources/predicates.go
index e1b53f49241..5eb0bb91e57 100644
--- a/resource-manager/recoveryservices/2022-08-01/listprivatelinkresources/predicates.go
+++ b/resource-manager/recoveryservices/2022-08-01/listprivatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservices/2022-08-01/vaults/predicates.go b/resource-manager/recoveryservices/2022-08-01/vaults/predicates.go
index ac2524ee58a..1039a9afe4e 100644
--- a/resource-manager/recoveryservices/2022-08-01/vaults/predicates.go
+++ b/resource-manager/recoveryservices/2022-08-01/vaults/predicates.go
@@ -13,11 +13,11 @@ type VaultOperationPredicate struct {
 
 func (p VaultOperationPredicate) Matches(input Vault) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p VaultOperationPredicate) Matches(input Vault) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservices/2022-09-10/listprivatelinkresources/predicates.go b/resource-manager/recoveryservices/2022-09-10/listprivatelinkresources/predicates.go
index e1b53f49241..5eb0bb91e57 100644
--- a/resource-manager/recoveryservices/2022-09-10/listprivatelinkresources/predicates.go
+++ b/resource-manager/recoveryservices/2022-09-10/listprivatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservices/2022-09-10/vaults/predicates.go b/resource-manager/recoveryservices/2022-09-10/vaults/predicates.go
index ac2524ee58a..1039a9afe4e 100644
--- a/resource-manager/recoveryservices/2022-09-10/vaults/predicates.go
+++ b/resource-manager/recoveryservices/2022-09-10/vaults/predicates.go
@@ -13,11 +13,11 @@ type VaultOperationPredicate struct {
 
 func (p VaultOperationPredicate) Matches(input Vault) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p VaultOperationPredicate) Matches(input Vault) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservices/2022-10-01/listprivatelinkresources/predicates.go b/resource-manager/recoveryservices/2022-10-01/listprivatelinkresources/predicates.go
index e1b53f49241..5eb0bb91e57 100644
--- a/resource-manager/recoveryservices/2022-10-01/listprivatelinkresources/predicates.go
+++ b/resource-manager/recoveryservices/2022-10-01/listprivatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservices/2022-10-01/vaults/predicates.go b/resource-manager/recoveryservices/2022-10-01/vaults/predicates.go
index ac2524ee58a..1039a9afe4e 100644
--- a/resource-manager/recoveryservices/2022-10-01/vaults/predicates.go
+++ b/resource-manager/recoveryservices/2022-10-01/vaults/predicates.go
@@ -13,11 +13,11 @@ type VaultOperationPredicate struct {
 
 func (p VaultOperationPredicate) Matches(input Vault) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p VaultOperationPredicate) Matches(input Vault) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservices/2023-02-01/listprivatelinkresources/predicates.go b/resource-manager/recoveryservices/2023-02-01/listprivatelinkresources/predicates.go
index e1b53f49241..5eb0bb91e57 100644
--- a/resource-manager/recoveryservices/2023-02-01/listprivatelinkresources/predicates.go
+++ b/resource-manager/recoveryservices/2023-02-01/listprivatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservices/2023-02-01/vaults/predicates.go b/resource-manager/recoveryservices/2023-02-01/vaults/predicates.go
index ac2524ee58a..1039a9afe4e 100644
--- a/resource-manager/recoveryservices/2023-02-01/vaults/predicates.go
+++ b/resource-manager/recoveryservices/2023-02-01/vaults/predicates.go
@@ -13,11 +13,11 @@ type VaultOperationPredicate struct {
 
 func (p VaultOperationPredicate) Matches(input Vault) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p VaultOperationPredicate) Matches(input Vault) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservices/2023-04-01/listprivatelinkresources/predicates.go b/resource-manager/recoveryservices/2023-04-01/listprivatelinkresources/predicates.go
index e1b53f49241..5eb0bb91e57 100644
--- a/resource-manager/recoveryservices/2023-04-01/listprivatelinkresources/predicates.go
+++ b/resource-manager/recoveryservices/2023-04-01/listprivatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservices/2023-04-01/vaults/predicates.go b/resource-manager/recoveryservices/2023-04-01/vaults/predicates.go
index ac2524ee58a..1039a9afe4e 100644
--- a/resource-manager/recoveryservices/2023-04-01/vaults/predicates.go
+++ b/resource-manager/recoveryservices/2023-04-01/vaults/predicates.go
@@ -13,11 +13,11 @@ type VaultOperationPredicate struct {
 
 func (p VaultOperationPredicate) Matches(input Vault) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p VaultOperationPredicate) Matches(input Vault) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-01-15/backupcrrjobs/predicates.go b/resource-manager/recoveryservicesbackup/2023-01-15/backupcrrjobs/predicates.go
index 63bf7d52714..bd273e71b98 100644
--- a/resource-manager/recoveryservicesbackup/2023-01-15/backupcrrjobs/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-01-15/backupcrrjobs/predicates.go
@@ -13,23 +13,23 @@ type JobResourceOperationPredicate struct {
 
 func (p JobResourceOperationPredicate) Matches(input JobResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-01-15/backupprotecteditemscrr/predicates.go b/resource-manager/recoveryservicesbackup/2023-01-15/backupprotecteditemscrr/predicates.go
index 2f7b29ad407..bdaa03f51d2 100644
--- a/resource-manager/recoveryservicesbackup/2023-01-15/backupprotecteditemscrr/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-01-15/backupprotecteditemscrr/predicates.go
@@ -13,23 +13,23 @@ type ProtectedItemResourceOperationPredicate struct {
 
 func (p ProtectedItemResourceOperationPredicate) Matches(input ProtectedItemResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-01-15/recoverypointscrr/predicates.go b/resource-manager/recoveryservicesbackup/2023-01-15/recoverypointscrr/predicates.go
index 3ca9f944655..5f0e3c9e9ac 100644
--- a/resource-manager/recoveryservicesbackup/2023-01-15/recoverypointscrr/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-01-15/recoverypointscrr/predicates.go
@@ -13,23 +13,23 @@ type RecoveryPointResourceOperationPredicate struct {
 
 func (p RecoveryPointResourceOperationPredicate) Matches(input RecoveryPointResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-02-01/backupengines/predicates.go b/resource-manager/recoveryservicesbackup/2023-02-01/backupengines/predicates.go
index 05d5e184fb4..5d9e2bfd1f8 100644
--- a/resource-manager/recoveryservicesbackup/2023-02-01/backupengines/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-02-01/backupengines/predicates.go
@@ -13,23 +13,23 @@ type BackupEngineBaseResourceOperationPredicate struct {
 
 func (p BackupEngineBaseResourceOperationPredicate) Matches(input BackupEngineBaseResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-02-01/backupjobs/predicates.go b/resource-manager/recoveryservicesbackup/2023-02-01/backupjobs/predicates.go
index 00ced650b3e..f8942840380 100644
--- a/resource-manager/recoveryservicesbackup/2023-02-01/backupjobs/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-02-01/backupjobs/predicates.go
@@ -13,23 +13,23 @@ type JobResourceOperationPredicate struct {
 
 func (p JobResourceOperationPredicate) Matches(input JobResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-02-01/backuppolicies/predicates.go b/resource-manager/recoveryservicesbackup/2023-02-01/backuppolicies/predicates.go
index 96fc03d34ad..cdc446bbcfb 100644
--- a/resource-manager/recoveryservicesbackup/2023-02-01/backuppolicies/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-02-01/backuppolicies/predicates.go
@@ -13,23 +13,23 @@ type ProtectionPolicyResourceOperationPredicate struct {
 
 func (p ProtectionPolicyResourceOperationPredicate) Matches(input ProtectionPolicyResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-02-01/backupprotectableitems/predicates.go b/resource-manager/recoveryservicesbackup/2023-02-01/backupprotectableitems/predicates.go
index bb90f9edb61..464f22ae33b 100644
--- a/resource-manager/recoveryservicesbackup/2023-02-01/backupprotectableitems/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-02-01/backupprotectableitems/predicates.go
@@ -13,23 +13,23 @@ type WorkloadProtectableItemResourceOperationPredicate struct {
 
 func (p WorkloadProtectableItemResourceOperationPredicate) Matches(input WorkloadProtectableItemResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-02-01/backupprotecteditems/predicates.go b/resource-manager/recoveryservicesbackup/2023-02-01/backupprotecteditems/predicates.go
index 5a0d1c82b79..92b0067d35e 100644
--- a/resource-manager/recoveryservicesbackup/2023-02-01/backupprotecteditems/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-02-01/backupprotecteditems/predicates.go
@@ -13,23 +13,23 @@ type ProtectedItemResourceOperationPredicate struct {
 
 func (p ProtectedItemResourceOperationPredicate) Matches(input ProtectedItemResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-02-01/backupprotectioncontainers/predicates.go b/resource-manager/recoveryservicesbackup/2023-02-01/backupprotectioncontainers/predicates.go
index 1d3cc2e90ae..2c7170b0702 100644
--- a/resource-manager/recoveryservicesbackup/2023-02-01/backupprotectioncontainers/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-02-01/backupprotectioncontainers/predicates.go
@@ -13,23 +13,23 @@ type ProtectionContainerResourceOperationPredicate struct {
 
 func (p ProtectionContainerResourceOperationPredicate) Matches(input ProtectionContainerResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-02-01/backupprotectionintent/predicates.go b/resource-manager/recoveryservicesbackup/2023-02-01/backupprotectionintent/predicates.go
index 1732c62d604..26161b72fe6 100644
--- a/resource-manager/recoveryservicesbackup/2023-02-01/backupprotectionintent/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-02-01/backupprotectionintent/predicates.go
@@ -13,23 +13,23 @@ type ProtectionIntentResourceOperationPredicate struct {
 
 func (p ProtectionIntentResourceOperationPredicate) Matches(input ProtectionIntentResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-02-01/backupworkloaditems/predicates.go b/resource-manager/recoveryservicesbackup/2023-02-01/backupworkloaditems/predicates.go
index f69a0b485e2..98e6f2ee1de 100644
--- a/resource-manager/recoveryservicesbackup/2023-02-01/backupworkloaditems/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-02-01/backupworkloaditems/predicates.go
@@ -13,23 +13,23 @@ type WorkloadItemResourceOperationPredicate struct {
 
 func (p WorkloadItemResourceOperationPredicate) Matches(input WorkloadItemResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-02-01/protectablecontainers/predicates.go b/resource-manager/recoveryservicesbackup/2023-02-01/protectablecontainers/predicates.go
index d2037b961f0..8ce6de2e8ce 100644
--- a/resource-manager/recoveryservicesbackup/2023-02-01/protectablecontainers/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-02-01/protectablecontainers/predicates.go
@@ -13,23 +13,23 @@ type ProtectableContainerResourceOperationPredicate struct {
 
 func (p ProtectableContainerResourceOperationPredicate) Matches(input ProtectableContainerResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-02-01/recoverypoints/predicates.go b/resource-manager/recoveryservicesbackup/2023-02-01/recoverypoints/predicates.go
index 5b2e75923a6..c3db33a5e75 100644
--- a/resource-manager/recoveryservicesbackup/2023-02-01/recoverypoints/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-02-01/recoverypoints/predicates.go
@@ -13,23 +13,23 @@ type RecoveryPointResourceOperationPredicate struct {
 
 func (p RecoveryPointResourceOperationPredicate) Matches(input RecoveryPointResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-02-01/recoverypointsrecommendedformove/predicates.go b/resource-manager/recoveryservicesbackup/2023-02-01/recoverypointsrecommendedformove/predicates.go
index d6cd7490cce..9f73792f14b 100644
--- a/resource-manager/recoveryservicesbackup/2023-02-01/recoverypointsrecommendedformove/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-02-01/recoverypointsrecommendedformove/predicates.go
@@ -13,23 +13,23 @@ type RecoveryPointResourceOperationPredicate struct {
 
 func (p RecoveryPointResourceOperationPredicate) Matches(input RecoveryPointResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-02-01/resourceguardproxies/predicates.go b/resource-manager/recoveryservicesbackup/2023-02-01/resourceguardproxies/predicates.go
index 979152ae703..dca1b113f34 100644
--- a/resource-manager/recoveryservicesbackup/2023-02-01/resourceguardproxies/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-02-01/resourceguardproxies/predicates.go
@@ -13,23 +13,23 @@ type ResourceGuardProxyBaseResourceOperationPredicate struct {
 
 func (p ResourceGuardProxyBaseResourceOperationPredicate) Matches(input ResourceGuardProxyBaseResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-02-01/softdeletedcontainers/predicates.go b/resource-manager/recoveryservicesbackup/2023-02-01/softdeletedcontainers/predicates.go
index 259e53120a0..65cbf0427e6 100644
--- a/resource-manager/recoveryservicesbackup/2023-02-01/softdeletedcontainers/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-02-01/softdeletedcontainers/predicates.go
@@ -13,23 +13,23 @@ type ProtectionContainerResourceOperationPredicate struct {
 
 func (p ProtectionContainerResourceOperationPredicate) Matches(input ProtectionContainerResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-04-01/backupengines/predicates.go b/resource-manager/recoveryservicesbackup/2023-04-01/backupengines/predicates.go
index 05d5e184fb4..5d9e2bfd1f8 100644
--- a/resource-manager/recoveryservicesbackup/2023-04-01/backupengines/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-04-01/backupengines/predicates.go
@@ -13,23 +13,23 @@ type BackupEngineBaseResourceOperationPredicate struct {
 
 func (p BackupEngineBaseResourceOperationPredicate) Matches(input BackupEngineBaseResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-04-01/backupjobs/predicates.go b/resource-manager/recoveryservicesbackup/2023-04-01/backupjobs/predicates.go
index 00ced650b3e..f8942840380 100644
--- a/resource-manager/recoveryservicesbackup/2023-04-01/backupjobs/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-04-01/backupjobs/predicates.go
@@ -13,23 +13,23 @@ type JobResourceOperationPredicate struct {
 
 func (p JobResourceOperationPredicate) Matches(input JobResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-04-01/backuppolicies/predicates.go b/resource-manager/recoveryservicesbackup/2023-04-01/backuppolicies/predicates.go
index 96fc03d34ad..cdc446bbcfb 100644
--- a/resource-manager/recoveryservicesbackup/2023-04-01/backuppolicies/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-04-01/backuppolicies/predicates.go
@@ -13,23 +13,23 @@ type ProtectionPolicyResourceOperationPredicate struct {
 
 func (p ProtectionPolicyResourceOperationPredicate) Matches(input ProtectionPolicyResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-04-01/backupprotectableitems/predicates.go b/resource-manager/recoveryservicesbackup/2023-04-01/backupprotectableitems/predicates.go
index bb90f9edb61..464f22ae33b 100644
--- a/resource-manager/recoveryservicesbackup/2023-04-01/backupprotectableitems/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-04-01/backupprotectableitems/predicates.go
@@ -13,23 +13,23 @@ type WorkloadProtectableItemResourceOperationPredicate struct {
 
 func (p WorkloadProtectableItemResourceOperationPredicate) Matches(input WorkloadProtectableItemResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-04-01/backupprotecteditems/predicates.go b/resource-manager/recoveryservicesbackup/2023-04-01/backupprotecteditems/predicates.go
index 5a0d1c82b79..92b0067d35e 100644
--- a/resource-manager/recoveryservicesbackup/2023-04-01/backupprotecteditems/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-04-01/backupprotecteditems/predicates.go
@@ -13,23 +13,23 @@ type ProtectedItemResourceOperationPredicate struct {
 
 func (p ProtectedItemResourceOperationPredicate) Matches(input ProtectedItemResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-04-01/backupprotectioncontainers/predicates.go b/resource-manager/recoveryservicesbackup/2023-04-01/backupprotectioncontainers/predicates.go
index 1d3cc2e90ae..2c7170b0702 100644
--- a/resource-manager/recoveryservicesbackup/2023-04-01/backupprotectioncontainers/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-04-01/backupprotectioncontainers/predicates.go
@@ -13,23 +13,23 @@ type ProtectionContainerResourceOperationPredicate struct {
 
 func (p ProtectionContainerResourceOperationPredicate) Matches(input ProtectionContainerResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-04-01/backupprotectionintent/predicates.go b/resource-manager/recoveryservicesbackup/2023-04-01/backupprotectionintent/predicates.go
index 1732c62d604..26161b72fe6 100644
--- a/resource-manager/recoveryservicesbackup/2023-04-01/backupprotectionintent/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-04-01/backupprotectionintent/predicates.go
@@ -13,23 +13,23 @@ type ProtectionIntentResourceOperationPredicate struct {
 
 func (p ProtectionIntentResourceOperationPredicate) Matches(input ProtectionIntentResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-04-01/backupworkloaditems/predicates.go b/resource-manager/recoveryservicesbackup/2023-04-01/backupworkloaditems/predicates.go
index f69a0b485e2..98e6f2ee1de 100644
--- a/resource-manager/recoveryservicesbackup/2023-04-01/backupworkloaditems/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-04-01/backupworkloaditems/predicates.go
@@ -13,23 +13,23 @@ type WorkloadItemResourceOperationPredicate struct {
 
 func (p WorkloadItemResourceOperationPredicate) Matches(input WorkloadItemResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-04-01/protectablecontainers/predicates.go b/resource-manager/recoveryservicesbackup/2023-04-01/protectablecontainers/predicates.go
index d2037b961f0..8ce6de2e8ce 100644
--- a/resource-manager/recoveryservicesbackup/2023-04-01/protectablecontainers/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-04-01/protectablecontainers/predicates.go
@@ -13,23 +13,23 @@ type ProtectableContainerResourceOperationPredicate struct {
 
 func (p ProtectableContainerResourceOperationPredicate) Matches(input ProtectableContainerResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-04-01/recoverypoints/predicates.go b/resource-manager/recoveryservicesbackup/2023-04-01/recoverypoints/predicates.go
index 5b2e75923a6..c3db33a5e75 100644
--- a/resource-manager/recoveryservicesbackup/2023-04-01/recoverypoints/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-04-01/recoverypoints/predicates.go
@@ -13,23 +13,23 @@ type RecoveryPointResourceOperationPredicate struct {
 
 func (p RecoveryPointResourceOperationPredicate) Matches(input RecoveryPointResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-04-01/recoverypointsrecommendedformove/predicates.go b/resource-manager/recoveryservicesbackup/2023-04-01/recoverypointsrecommendedformove/predicates.go
index d6cd7490cce..9f73792f14b 100644
--- a/resource-manager/recoveryservicesbackup/2023-04-01/recoverypointsrecommendedformove/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-04-01/recoverypointsrecommendedformove/predicates.go
@@ -13,23 +13,23 @@ type RecoveryPointResourceOperationPredicate struct {
 
 func (p RecoveryPointResourceOperationPredicate) Matches(input RecoveryPointResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-04-01/resourceguardproxies/predicates.go b/resource-manager/recoveryservicesbackup/2023-04-01/resourceguardproxies/predicates.go
index 979152ae703..dca1b113f34 100644
--- a/resource-manager/recoveryservicesbackup/2023-04-01/resourceguardproxies/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-04-01/resourceguardproxies/predicates.go
@@ -13,23 +13,23 @@ type ResourceGuardProxyBaseResourceOperationPredicate struct {
 
 func (p ResourceGuardProxyBaseResourceOperationPredicate) Matches(input ResourceGuardProxyBaseResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicesbackup/2023-04-01/softdeletedcontainers/predicates.go b/resource-manager/recoveryservicesbackup/2023-04-01/softdeletedcontainers/predicates.go
index 259e53120a0..65cbf0427e6 100644
--- a/resource-manager/recoveryservicesbackup/2023-04-01/softdeletedcontainers/predicates.go
+++ b/resource-manager/recoveryservicesbackup/2023-04-01/softdeletedcontainers/predicates.go
@@ -13,23 +13,23 @@ type ProtectionContainerResourceOperationPredicate struct {
 
 func (p ProtectionContainerResourceOperationPredicate) Matches(input ProtectionContainerResource) bool {
 
-	if p.ETag != nil && (input.ETag == nil && *p.ETag != *input.ETag) {
+	if p.ETag != nil && (input.ETag == nil || *p.ETag != *input.ETag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/migrationrecoverypoints/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/migrationrecoverypoints/predicates.go
index 2d50ad009a2..62a451ad032 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/migrationrecoverypoints/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/migrationrecoverypoints/predicates.go
@@ -12,19 +12,19 @@ type MigrationRecoveryPointOperationPredicate struct {
 
 func (p MigrationRecoveryPointOperationPredicate) Matches(input MigrationRecoveryPoint) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/operations/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/operations/predicates.go
index ad246da810d..6c9c733282f 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/operations/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/operations/predicates.go
@@ -11,15 +11,15 @@ type OperationsDiscoveryOperationPredicate struct {
 
 func (p OperationsDiscoveryOperationPredicate) Matches(input OperationsDiscovery) bool {
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Origin != nil && (input.Origin == nil && *p.Origin != *input.Origin) {
+	if p.Origin != nil && (input.Origin == nil || *p.Origin != *input.Origin) {
 		return false
 	}
 
-	if p.Properties != nil && (input.Properties == nil && *p.Properties != *input.Properties) {
+	if p.Properties != nil && (input.Properties == nil || *p.Properties != *input.Properties) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/recoverypoints/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/recoverypoints/predicates.go
index 1d3e414e2cc..599a0311cbf 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/recoverypoints/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/recoverypoints/predicates.go
@@ -12,19 +12,19 @@ type RecoveryPointOperationPredicate struct {
 
 func (p RecoveryPointOperationPredicate) Matches(input RecoveryPoint) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationalertsettings/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationalertsettings/predicates.go
index 532de0d806f..456cd1b810e 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationalertsettings/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationalertsettings/predicates.go
@@ -12,19 +12,19 @@ type AlertOperationPredicate struct {
 
 func (p AlertOperationPredicate) Matches(input Alert) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationevents/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationevents/predicates.go
index 2c9f5c9cae0..323e9dc1ff0 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationevents/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationevents/predicates.go
@@ -12,19 +12,19 @@ type EventOperationPredicate struct {
 
 func (p EventOperationPredicate) Matches(input Event) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationfabrics/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationfabrics/predicates.go
index 8b9cb4978ce..faded6326cb 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationfabrics/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationfabrics/predicates.go
@@ -12,19 +12,19 @@ type FabricOperationPredicate struct {
 
 func (p FabricOperationPredicate) Matches(input Fabric) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationjobs/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationjobs/predicates.go
index aaaf2a4a501..840f78ec8e3 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationjobs/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationjobs/predicates.go
@@ -12,19 +12,19 @@ type JobOperationPredicate struct {
 
 func (p JobOperationPredicate) Matches(input Job) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationlogicalnetworks/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationlogicalnetworks/predicates.go
index 35d419d424a..30e71a8f92c 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationlogicalnetworks/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationlogicalnetworks/predicates.go
@@ -12,19 +12,19 @@ type LogicalNetworkOperationPredicate struct {
 
 func (p LogicalNetworkOperationPredicate) Matches(input LogicalNetwork) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationmigrationitems/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationmigrationitems/predicates.go
index 41a62705f7e..38625eaca48 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationmigrationitems/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationmigrationitems/predicates.go
@@ -12,19 +12,19 @@ type MigrationItemOperationPredicate struct {
 
 func (p MigrationItemOperationPredicate) Matches(input MigrationItem) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationnetworkmappings/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationnetworkmappings/predicates.go
index d3d33679bde..716755e52f7 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationnetworkmappings/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationnetworkmappings/predicates.go
@@ -12,19 +12,19 @@ type NetworkMappingOperationPredicate struct {
 
 func (p NetworkMappingOperationPredicate) Matches(input NetworkMapping) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationnetworks/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationnetworks/predicates.go
index 7cf85d61c5a..98e4bcc158c 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationnetworks/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationnetworks/predicates.go
@@ -12,19 +12,19 @@ type NetworkOperationPredicate struct {
 
 func (p NetworkOperationPredicate) Matches(input Network) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationpolicies/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationpolicies/predicates.go
index bde5ece565b..3cb066948b0 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationpolicies/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationpolicies/predicates.go
@@ -12,19 +12,19 @@ type PolicyOperationPredicate struct {
 
 func (p PolicyOperationPredicate) Matches(input Policy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationprotectableitems/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationprotectableitems/predicates.go
index 06bc4485e63..cd7684d6433 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationprotectableitems/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationprotectableitems/predicates.go
@@ -12,19 +12,19 @@ type ProtectableItemOperationPredicate struct {
 
 func (p ProtectableItemOperationPredicate) Matches(input ProtectableItem) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationprotecteditems/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationprotecteditems/predicates.go
index d767b25ccdc..533da5b6f5e 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationprotecteditems/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationprotecteditems/predicates.go
@@ -12,19 +12,19 @@ type ReplicationProtectedItemOperationPredicate struct {
 
 func (p ReplicationProtectedItemOperationPredicate) Matches(input ReplicationProtectedItem) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationprotectioncontainermappings/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationprotectioncontainermappings/predicates.go
index e13e9e577e2..c60ddcb4a31 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationprotectioncontainermappings/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationprotectioncontainermappings/predicates.go
@@ -12,19 +12,19 @@ type ProtectionContainerMappingOperationPredicate struct {
 
 func (p ProtectionContainerMappingOperationPredicate) Matches(input ProtectionContainerMapping) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationprotectioncontainers/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationprotectioncontainers/predicates.go
index 10d3d956e23..842a1e7ff08 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationprotectioncontainers/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationprotectioncontainers/predicates.go
@@ -12,19 +12,19 @@ type ProtectionContainerOperationPredicate struct {
 
 func (p ProtectionContainerOperationPredicate) Matches(input ProtectionContainer) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationprotectionintents/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationprotectionintents/predicates.go
index 460c9a788a7..9a372249403 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationprotectionintents/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationprotectionintents/predicates.go
@@ -12,19 +12,19 @@ type ReplicationProtectionIntentOperationPredicate struct {
 
 func (p ReplicationProtectionIntentOperationPredicate) Matches(input ReplicationProtectionIntent) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationrecoveryplans/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationrecoveryplans/predicates.go
index f52b5d7a104..d6c5e9c2534 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationrecoveryplans/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationrecoveryplans/predicates.go
@@ -12,19 +12,19 @@ type RecoveryPlanOperationPredicate struct {
 
 func (p RecoveryPlanOperationPredicate) Matches(input RecoveryPlan) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationrecoveryservicesproviders/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationrecoveryservicesproviders/predicates.go
index f879431fccb..4377b19a42f 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationrecoveryservicesproviders/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationrecoveryservicesproviders/predicates.go
@@ -12,19 +12,19 @@ type RecoveryServicesProviderOperationPredicate struct {
 
 func (p RecoveryServicesProviderOperationPredicate) Matches(input RecoveryServicesProvider) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationstorageclassificationmappings/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationstorageclassificationmappings/predicates.go
index 46b7f3a60ab..128f8cd8e3d 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationstorageclassificationmappings/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationstorageclassificationmappings/predicates.go
@@ -12,19 +12,19 @@ type StorageClassificationMappingOperationPredicate struct {
 
 func (p StorageClassificationMappingOperationPredicate) Matches(input StorageClassificationMapping) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationstorageclassifications/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationstorageclassifications/predicates.go
index 5b1ee94ed56..6fae7a2f37c 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationstorageclassifications/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationstorageclassifications/predicates.go
@@ -12,19 +12,19 @@ type StorageClassificationOperationPredicate struct {
 
 func (p StorageClassificationOperationPredicate) Matches(input StorageClassification) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationvaultsetting/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationvaultsetting/predicates.go
index 408c4504a31..8e5065553c1 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationvaultsetting/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationvaultsetting/predicates.go
@@ -12,19 +12,19 @@ type VaultSettingOperationPredicate struct {
 
 func (p VaultSettingOperationPredicate) Matches(input VaultSetting) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationvcenters/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationvcenters/predicates.go
index 5c1563c6d10..604db32ccd0 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationvcenters/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationvcenters/predicates.go
@@ -12,19 +12,19 @@ type VCenterOperationPredicate struct {
 
 func (p VCenterOperationPredicate) Matches(input VCenter) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2022-10-01/targetcomputesizes/predicates.go b/resource-manager/recoveryservicessiterecovery/2022-10-01/targetcomputesizes/predicates.go
index 2ce6ae5b3fc..e884ca4906e 100644
--- a/resource-manager/recoveryservicessiterecovery/2022-10-01/targetcomputesizes/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2022-10-01/targetcomputesizes/predicates.go
@@ -11,15 +11,15 @@ type TargetComputeSizeOperationPredicate struct {
 
 func (p TargetComputeSizeOperationPredicate) Matches(input TargetComputeSize) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/migrationrecoverypoints/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/migrationrecoverypoints/predicates.go
index 2d50ad009a2..62a451ad032 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/migrationrecoverypoints/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/migrationrecoverypoints/predicates.go
@@ -12,19 +12,19 @@ type MigrationRecoveryPointOperationPredicate struct {
 
 func (p MigrationRecoveryPointOperationPredicate) Matches(input MigrationRecoveryPoint) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/operations/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/operations/predicates.go
index ad246da810d..6c9c733282f 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/operations/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/operations/predicates.go
@@ -11,15 +11,15 @@ type OperationsDiscoveryOperationPredicate struct {
 
 func (p OperationsDiscoveryOperationPredicate) Matches(input OperationsDiscovery) bool {
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Origin != nil && (input.Origin == nil && *p.Origin != *input.Origin) {
+	if p.Origin != nil && (input.Origin == nil || *p.Origin != *input.Origin) {
 		return false
 	}
 
-	if p.Properties != nil && (input.Properties == nil && *p.Properties != *input.Properties) {
+	if p.Properties != nil && (input.Properties == nil || *p.Properties != *input.Properties) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/recoverypoints/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/recoverypoints/predicates.go
index 1d3e414e2cc..599a0311cbf 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/recoverypoints/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/recoverypoints/predicates.go
@@ -12,19 +12,19 @@ type RecoveryPointOperationPredicate struct {
 
 func (p RecoveryPointOperationPredicate) Matches(input RecoveryPoint) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationalertsettings/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationalertsettings/predicates.go
index 532de0d806f..456cd1b810e 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationalertsettings/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationalertsettings/predicates.go
@@ -12,19 +12,19 @@ type AlertOperationPredicate struct {
 
 func (p AlertOperationPredicate) Matches(input Alert) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationevents/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationevents/predicates.go
index 2c9f5c9cae0..323e9dc1ff0 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationevents/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationevents/predicates.go
@@ -12,19 +12,19 @@ type EventOperationPredicate struct {
 
 func (p EventOperationPredicate) Matches(input Event) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationfabrics/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationfabrics/predicates.go
index 8b9cb4978ce..faded6326cb 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationfabrics/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationfabrics/predicates.go
@@ -12,19 +12,19 @@ type FabricOperationPredicate struct {
 
 func (p FabricOperationPredicate) Matches(input Fabric) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationjobs/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationjobs/predicates.go
index aaaf2a4a501..840f78ec8e3 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationjobs/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationjobs/predicates.go
@@ -12,19 +12,19 @@ type JobOperationPredicate struct {
 
 func (p JobOperationPredicate) Matches(input Job) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationlogicalnetworks/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationlogicalnetworks/predicates.go
index 35d419d424a..30e71a8f92c 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationlogicalnetworks/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationlogicalnetworks/predicates.go
@@ -12,19 +12,19 @@ type LogicalNetworkOperationPredicate struct {
 
 func (p LogicalNetworkOperationPredicate) Matches(input LogicalNetwork) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationmigrationitems/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationmigrationitems/predicates.go
index 41a62705f7e..38625eaca48 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationmigrationitems/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationmigrationitems/predicates.go
@@ -12,19 +12,19 @@ type MigrationItemOperationPredicate struct {
 
 func (p MigrationItemOperationPredicate) Matches(input MigrationItem) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationnetworkmappings/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationnetworkmappings/predicates.go
index d3d33679bde..716755e52f7 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationnetworkmappings/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationnetworkmappings/predicates.go
@@ -12,19 +12,19 @@ type NetworkMappingOperationPredicate struct {
 
 func (p NetworkMappingOperationPredicate) Matches(input NetworkMapping) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationnetworks/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationnetworks/predicates.go
index 7cf85d61c5a..98e4bcc158c 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationnetworks/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationnetworks/predicates.go
@@ -12,19 +12,19 @@ type NetworkOperationPredicate struct {
 
 func (p NetworkOperationPredicate) Matches(input Network) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationpolicies/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationpolicies/predicates.go
index bde5ece565b..3cb066948b0 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationpolicies/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationpolicies/predicates.go
@@ -12,19 +12,19 @@ type PolicyOperationPredicate struct {
 
 func (p PolicyOperationPredicate) Matches(input Policy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationprotectableitems/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationprotectableitems/predicates.go
index 06bc4485e63..cd7684d6433 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationprotectableitems/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationprotectableitems/predicates.go
@@ -12,19 +12,19 @@ type ProtectableItemOperationPredicate struct {
 
 func (p ProtectableItemOperationPredicate) Matches(input ProtectableItem) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationprotecteditems/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationprotecteditems/predicates.go
index d767b25ccdc..533da5b6f5e 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationprotecteditems/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationprotecteditems/predicates.go
@@ -12,19 +12,19 @@ type ReplicationProtectedItemOperationPredicate struct {
 
 func (p ReplicationProtectedItemOperationPredicate) Matches(input ReplicationProtectedItem) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationprotectioncontainermappings/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationprotectioncontainermappings/predicates.go
index e13e9e577e2..c60ddcb4a31 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationprotectioncontainermappings/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationprotectioncontainermappings/predicates.go
@@ -12,19 +12,19 @@ type ProtectionContainerMappingOperationPredicate struct {
 
 func (p ProtectionContainerMappingOperationPredicate) Matches(input ProtectionContainerMapping) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationprotectioncontainers/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationprotectioncontainers/predicates.go
index 10d3d956e23..842a1e7ff08 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationprotectioncontainers/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationprotectioncontainers/predicates.go
@@ -12,19 +12,19 @@ type ProtectionContainerOperationPredicate struct {
 
 func (p ProtectionContainerOperationPredicate) Matches(input ProtectionContainer) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationprotectionintents/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationprotectionintents/predicates.go
index 460c9a788a7..9a372249403 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationprotectionintents/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationprotectionintents/predicates.go
@@ -12,19 +12,19 @@ type ReplicationProtectionIntentOperationPredicate struct {
 
 func (p ReplicationProtectionIntentOperationPredicate) Matches(input ReplicationProtectionIntent) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationrecoveryplans/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationrecoveryplans/predicates.go
index f52b5d7a104..d6c5e9c2534 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationrecoveryplans/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationrecoveryplans/predicates.go
@@ -12,19 +12,19 @@ type RecoveryPlanOperationPredicate struct {
 
 func (p RecoveryPlanOperationPredicate) Matches(input RecoveryPlan) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationrecoveryservicesproviders/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationrecoveryservicesproviders/predicates.go
index f879431fccb..4377b19a42f 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationrecoveryservicesproviders/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationrecoveryservicesproviders/predicates.go
@@ -12,19 +12,19 @@ type RecoveryServicesProviderOperationPredicate struct {
 
 func (p RecoveryServicesProviderOperationPredicate) Matches(input RecoveryServicesProvider) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationstorageclassificationmappings/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationstorageclassificationmappings/predicates.go
index 46b7f3a60ab..128f8cd8e3d 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationstorageclassificationmappings/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationstorageclassificationmappings/predicates.go
@@ -12,19 +12,19 @@ type StorageClassificationMappingOperationPredicate struct {
 
 func (p StorageClassificationMappingOperationPredicate) Matches(input StorageClassificationMapping) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationstorageclassifications/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationstorageclassifications/predicates.go
index 5b1ee94ed56..6fae7a2f37c 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationstorageclassifications/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationstorageclassifications/predicates.go
@@ -12,19 +12,19 @@ type StorageClassificationOperationPredicate struct {
 
 func (p StorageClassificationOperationPredicate) Matches(input StorageClassification) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationvaultsetting/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationvaultsetting/predicates.go
index 408c4504a31..8e5065553c1 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationvaultsetting/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationvaultsetting/predicates.go
@@ -12,19 +12,19 @@ type VaultSettingOperationPredicate struct {
 
 func (p VaultSettingOperationPredicate) Matches(input VaultSetting) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationvcenters/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationvcenters/predicates.go
index 5c1563c6d10..604db32ccd0 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationvcenters/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/replicationvcenters/predicates.go
@@ -12,19 +12,19 @@ type VCenterOperationPredicate struct {
 
 func (p VCenterOperationPredicate) Matches(input VCenter) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-01-01/targetcomputesizes/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-01-01/targetcomputesizes/predicates.go
index 2ce6ae5b3fc..e884ca4906e 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-01-01/targetcomputesizes/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-01-01/targetcomputesizes/predicates.go
@@ -11,15 +11,15 @@ type TargetComputeSizeOperationPredicate struct {
 
 func (p TargetComputeSizeOperationPredicate) Matches(input TargetComputeSize) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/migrationrecoverypoints/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/migrationrecoverypoints/predicates.go
index 2d50ad009a2..62a451ad032 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/migrationrecoverypoints/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/migrationrecoverypoints/predicates.go
@@ -12,19 +12,19 @@ type MigrationRecoveryPointOperationPredicate struct {
 
 func (p MigrationRecoveryPointOperationPredicate) Matches(input MigrationRecoveryPoint) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/operations/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/operations/predicates.go
index ad246da810d..6c9c733282f 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/operations/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/operations/predicates.go
@@ -11,15 +11,15 @@ type OperationsDiscoveryOperationPredicate struct {
 
 func (p OperationsDiscoveryOperationPredicate) Matches(input OperationsDiscovery) bool {
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Origin != nil && (input.Origin == nil && *p.Origin != *input.Origin) {
+	if p.Origin != nil && (input.Origin == nil || *p.Origin != *input.Origin) {
 		return false
 	}
 
-	if p.Properties != nil && (input.Properties == nil && *p.Properties != *input.Properties) {
+	if p.Properties != nil && (input.Properties == nil || *p.Properties != *input.Properties) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/recoverypoints/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/recoverypoints/predicates.go
index 1d3e414e2cc..599a0311cbf 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/recoverypoints/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/recoverypoints/predicates.go
@@ -12,19 +12,19 @@ type RecoveryPointOperationPredicate struct {
 
 func (p RecoveryPointOperationPredicate) Matches(input RecoveryPoint) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationalertsettings/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationalertsettings/predicates.go
index 532de0d806f..456cd1b810e 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationalertsettings/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationalertsettings/predicates.go
@@ -12,19 +12,19 @@ type AlertOperationPredicate struct {
 
 func (p AlertOperationPredicate) Matches(input Alert) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationevents/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationevents/predicates.go
index 2c9f5c9cae0..323e9dc1ff0 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationevents/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationevents/predicates.go
@@ -12,19 +12,19 @@ type EventOperationPredicate struct {
 
 func (p EventOperationPredicate) Matches(input Event) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationfabrics/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationfabrics/predicates.go
index 8b9cb4978ce..faded6326cb 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationfabrics/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationfabrics/predicates.go
@@ -12,19 +12,19 @@ type FabricOperationPredicate struct {
 
 func (p FabricOperationPredicate) Matches(input Fabric) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationjobs/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationjobs/predicates.go
index aaaf2a4a501..840f78ec8e3 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationjobs/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationjobs/predicates.go
@@ -12,19 +12,19 @@ type JobOperationPredicate struct {
 
 func (p JobOperationPredicate) Matches(input Job) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationlogicalnetworks/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationlogicalnetworks/predicates.go
index 35d419d424a..30e71a8f92c 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationlogicalnetworks/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationlogicalnetworks/predicates.go
@@ -12,19 +12,19 @@ type LogicalNetworkOperationPredicate struct {
 
 func (p LogicalNetworkOperationPredicate) Matches(input LogicalNetwork) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationmigrationitems/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationmigrationitems/predicates.go
index 41a62705f7e..38625eaca48 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationmigrationitems/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationmigrationitems/predicates.go
@@ -12,19 +12,19 @@ type MigrationItemOperationPredicate struct {
 
 func (p MigrationItemOperationPredicate) Matches(input MigrationItem) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationnetworkmappings/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationnetworkmappings/predicates.go
index d3d33679bde..716755e52f7 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationnetworkmappings/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationnetworkmappings/predicates.go
@@ -12,19 +12,19 @@ type NetworkMappingOperationPredicate struct {
 
 func (p NetworkMappingOperationPredicate) Matches(input NetworkMapping) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationnetworks/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationnetworks/predicates.go
index 7cf85d61c5a..98e4bcc158c 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationnetworks/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationnetworks/predicates.go
@@ -12,19 +12,19 @@ type NetworkOperationPredicate struct {
 
 func (p NetworkOperationPredicate) Matches(input Network) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationpolicies/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationpolicies/predicates.go
index bde5ece565b..3cb066948b0 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationpolicies/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationpolicies/predicates.go
@@ -12,19 +12,19 @@ type PolicyOperationPredicate struct {
 
 func (p PolicyOperationPredicate) Matches(input Policy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationprotectableitems/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationprotectableitems/predicates.go
index 06bc4485e63..cd7684d6433 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationprotectableitems/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationprotectableitems/predicates.go
@@ -12,19 +12,19 @@ type ProtectableItemOperationPredicate struct {
 
 func (p ProtectableItemOperationPredicate) Matches(input ProtectableItem) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationprotecteditems/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationprotecteditems/predicates.go
index d767b25ccdc..533da5b6f5e 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationprotecteditems/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationprotecteditems/predicates.go
@@ -12,19 +12,19 @@ type ReplicationProtectedItemOperationPredicate struct {
 
 func (p ReplicationProtectedItemOperationPredicate) Matches(input ReplicationProtectedItem) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationprotectioncontainermappings/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationprotectioncontainermappings/predicates.go
index e13e9e577e2..c60ddcb4a31 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationprotectioncontainermappings/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationprotectioncontainermappings/predicates.go
@@ -12,19 +12,19 @@ type ProtectionContainerMappingOperationPredicate struct {
 
 func (p ProtectionContainerMappingOperationPredicate) Matches(input ProtectionContainerMapping) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationprotectioncontainers/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationprotectioncontainers/predicates.go
index 10d3d956e23..842a1e7ff08 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationprotectioncontainers/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationprotectioncontainers/predicates.go
@@ -12,19 +12,19 @@ type ProtectionContainerOperationPredicate struct {
 
 func (p ProtectionContainerOperationPredicate) Matches(input ProtectionContainer) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationprotectionintents/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationprotectionintents/predicates.go
index 460c9a788a7..9a372249403 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationprotectionintents/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationprotectionintents/predicates.go
@@ -12,19 +12,19 @@ type ReplicationProtectionIntentOperationPredicate struct {
 
 func (p ReplicationProtectionIntentOperationPredicate) Matches(input ReplicationProtectionIntent) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationrecoveryplans/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationrecoveryplans/predicates.go
index f52b5d7a104..d6c5e9c2534 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationrecoveryplans/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationrecoveryplans/predicates.go
@@ -12,19 +12,19 @@ type RecoveryPlanOperationPredicate struct {
 
 func (p RecoveryPlanOperationPredicate) Matches(input RecoveryPlan) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationrecoveryservicesproviders/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationrecoveryservicesproviders/predicates.go
index f879431fccb..4377b19a42f 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationrecoveryservicesproviders/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationrecoveryservicesproviders/predicates.go
@@ -12,19 +12,19 @@ type RecoveryServicesProviderOperationPredicate struct {
 
 func (p RecoveryServicesProviderOperationPredicate) Matches(input RecoveryServicesProvider) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationstorageclassificationmappings/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationstorageclassificationmappings/predicates.go
index 46b7f3a60ab..128f8cd8e3d 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationstorageclassificationmappings/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationstorageclassificationmappings/predicates.go
@@ -12,19 +12,19 @@ type StorageClassificationMappingOperationPredicate struct {
 
 func (p StorageClassificationMappingOperationPredicate) Matches(input StorageClassificationMapping) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationstorageclassifications/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationstorageclassifications/predicates.go
index 5b1ee94ed56..6fae7a2f37c 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationstorageclassifications/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationstorageclassifications/predicates.go
@@ -12,19 +12,19 @@ type StorageClassificationOperationPredicate struct {
 
 func (p StorageClassificationOperationPredicate) Matches(input StorageClassification) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationvaultsetting/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationvaultsetting/predicates.go
index 408c4504a31..8e5065553c1 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationvaultsetting/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationvaultsetting/predicates.go
@@ -12,19 +12,19 @@ type VaultSettingOperationPredicate struct {
 
 func (p VaultSettingOperationPredicate) Matches(input VaultSetting) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationvcenters/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationvcenters/predicates.go
index 5c1563c6d10..604db32ccd0 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationvcenters/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/replicationvcenters/predicates.go
@@ -12,19 +12,19 @@ type VCenterOperationPredicate struct {
 
 func (p VCenterOperationPredicate) Matches(input VCenter) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-02-01/targetcomputesizes/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-02-01/targetcomputesizes/predicates.go
index 2ce6ae5b3fc..e884ca4906e 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-02-01/targetcomputesizes/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-02-01/targetcomputesizes/predicates.go
@@ -11,15 +11,15 @@ type TargetComputeSizeOperationPredicate struct {
 
 func (p TargetComputeSizeOperationPredicate) Matches(input TargetComputeSize) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/migrationrecoverypoints/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/migrationrecoverypoints/predicates.go
index 2d50ad009a2..62a451ad032 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/migrationrecoverypoints/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/migrationrecoverypoints/predicates.go
@@ -12,19 +12,19 @@ type MigrationRecoveryPointOperationPredicate struct {
 
 func (p MigrationRecoveryPointOperationPredicate) Matches(input MigrationRecoveryPoint) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/operations/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/operations/predicates.go
index ad246da810d..6c9c733282f 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/operations/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/operations/predicates.go
@@ -11,15 +11,15 @@ type OperationsDiscoveryOperationPredicate struct {
 
 func (p OperationsDiscoveryOperationPredicate) Matches(input OperationsDiscovery) bool {
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Origin != nil && (input.Origin == nil && *p.Origin != *input.Origin) {
+	if p.Origin != nil && (input.Origin == nil || *p.Origin != *input.Origin) {
 		return false
 	}
 
-	if p.Properties != nil && (input.Properties == nil && *p.Properties != *input.Properties) {
+	if p.Properties != nil && (input.Properties == nil || *p.Properties != *input.Properties) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/recoverypoints/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/recoverypoints/predicates.go
index 1d3e414e2cc..599a0311cbf 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/recoverypoints/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/recoverypoints/predicates.go
@@ -12,19 +12,19 @@ type RecoveryPointOperationPredicate struct {
 
 func (p RecoveryPointOperationPredicate) Matches(input RecoveryPoint) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationalertsettings/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationalertsettings/predicates.go
index 532de0d806f..456cd1b810e 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationalertsettings/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationalertsettings/predicates.go
@@ -12,19 +12,19 @@ type AlertOperationPredicate struct {
 
 func (p AlertOperationPredicate) Matches(input Alert) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationevents/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationevents/predicates.go
index 2c9f5c9cae0..323e9dc1ff0 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationevents/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationevents/predicates.go
@@ -12,19 +12,19 @@ type EventOperationPredicate struct {
 
 func (p EventOperationPredicate) Matches(input Event) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationfabrics/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationfabrics/predicates.go
index 8b9cb4978ce..faded6326cb 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationfabrics/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationfabrics/predicates.go
@@ -12,19 +12,19 @@ type FabricOperationPredicate struct {
 
 func (p FabricOperationPredicate) Matches(input Fabric) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationjobs/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationjobs/predicates.go
index aaaf2a4a501..840f78ec8e3 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationjobs/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationjobs/predicates.go
@@ -12,19 +12,19 @@ type JobOperationPredicate struct {
 
 func (p JobOperationPredicate) Matches(input Job) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationlogicalnetworks/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationlogicalnetworks/predicates.go
index 35d419d424a..30e71a8f92c 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationlogicalnetworks/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationlogicalnetworks/predicates.go
@@ -12,19 +12,19 @@ type LogicalNetworkOperationPredicate struct {
 
 func (p LogicalNetworkOperationPredicate) Matches(input LogicalNetwork) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationmigrationitems/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationmigrationitems/predicates.go
index 41a62705f7e..38625eaca48 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationmigrationitems/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationmigrationitems/predicates.go
@@ -12,19 +12,19 @@ type MigrationItemOperationPredicate struct {
 
 func (p MigrationItemOperationPredicate) Matches(input MigrationItem) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationnetworkmappings/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationnetworkmappings/predicates.go
index d3d33679bde..716755e52f7 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationnetworkmappings/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationnetworkmappings/predicates.go
@@ -12,19 +12,19 @@ type NetworkMappingOperationPredicate struct {
 
 func (p NetworkMappingOperationPredicate) Matches(input NetworkMapping) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationnetworks/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationnetworks/predicates.go
index 7cf85d61c5a..98e4bcc158c 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationnetworks/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationnetworks/predicates.go
@@ -12,19 +12,19 @@ type NetworkOperationPredicate struct {
 
 func (p NetworkOperationPredicate) Matches(input Network) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationpolicies/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationpolicies/predicates.go
index bde5ece565b..3cb066948b0 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationpolicies/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationpolicies/predicates.go
@@ -12,19 +12,19 @@ type PolicyOperationPredicate struct {
 
 func (p PolicyOperationPredicate) Matches(input Policy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationprotectableitems/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationprotectableitems/predicates.go
index 06bc4485e63..cd7684d6433 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationprotectableitems/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationprotectableitems/predicates.go
@@ -12,19 +12,19 @@ type ProtectableItemOperationPredicate struct {
 
 func (p ProtectableItemOperationPredicate) Matches(input ProtectableItem) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationprotecteditems/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationprotecteditems/predicates.go
index d767b25ccdc..533da5b6f5e 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationprotecteditems/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationprotecteditems/predicates.go
@@ -12,19 +12,19 @@ type ReplicationProtectedItemOperationPredicate struct {
 
 func (p ReplicationProtectedItemOperationPredicate) Matches(input ReplicationProtectedItem) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationprotectioncontainermappings/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationprotectioncontainermappings/predicates.go
index e13e9e577e2..c60ddcb4a31 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationprotectioncontainermappings/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationprotectioncontainermappings/predicates.go
@@ -12,19 +12,19 @@ type ProtectionContainerMappingOperationPredicate struct {
 
 func (p ProtectionContainerMappingOperationPredicate) Matches(input ProtectionContainerMapping) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationprotectioncontainers/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationprotectioncontainers/predicates.go
index 10d3d956e23..842a1e7ff08 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationprotectioncontainers/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationprotectioncontainers/predicates.go
@@ -12,19 +12,19 @@ type ProtectionContainerOperationPredicate struct {
 
 func (p ProtectionContainerOperationPredicate) Matches(input ProtectionContainer) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationprotectionintents/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationprotectionintents/predicates.go
index 460c9a788a7..9a372249403 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationprotectionintents/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationprotectionintents/predicates.go
@@ -12,19 +12,19 @@ type ReplicationProtectionIntentOperationPredicate struct {
 
 func (p ReplicationProtectionIntentOperationPredicate) Matches(input ReplicationProtectionIntent) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationrecoveryplans/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationrecoveryplans/predicates.go
index f52b5d7a104..d6c5e9c2534 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationrecoveryplans/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationrecoveryplans/predicates.go
@@ -12,19 +12,19 @@ type RecoveryPlanOperationPredicate struct {
 
 func (p RecoveryPlanOperationPredicate) Matches(input RecoveryPlan) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationrecoveryservicesproviders/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationrecoveryservicesproviders/predicates.go
index f879431fccb..4377b19a42f 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationrecoveryservicesproviders/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationrecoveryservicesproviders/predicates.go
@@ -12,19 +12,19 @@ type RecoveryServicesProviderOperationPredicate struct {
 
 func (p RecoveryServicesProviderOperationPredicate) Matches(input RecoveryServicesProvider) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationstorageclassificationmappings/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationstorageclassificationmappings/predicates.go
index 46b7f3a60ab..128f8cd8e3d 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationstorageclassificationmappings/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationstorageclassificationmappings/predicates.go
@@ -12,19 +12,19 @@ type StorageClassificationMappingOperationPredicate struct {
 
 func (p StorageClassificationMappingOperationPredicate) Matches(input StorageClassificationMapping) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationstorageclassifications/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationstorageclassifications/predicates.go
index 5b1ee94ed56..6fae7a2f37c 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationstorageclassifications/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationstorageclassifications/predicates.go
@@ -12,19 +12,19 @@ type StorageClassificationOperationPredicate struct {
 
 func (p StorageClassificationOperationPredicate) Matches(input StorageClassification) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationvaultsetting/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationvaultsetting/predicates.go
index 408c4504a31..8e5065553c1 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationvaultsetting/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationvaultsetting/predicates.go
@@ -12,19 +12,19 @@ type VaultSettingOperationPredicate struct {
 
 func (p VaultSettingOperationPredicate) Matches(input VaultSetting) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationvcenters/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationvcenters/predicates.go
index 5c1563c6d10..604db32ccd0 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationvcenters/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/replicationvcenters/predicates.go
@@ -12,19 +12,19 @@ type VCenterOperationPredicate struct {
 
 func (p VCenterOperationPredicate) Matches(input VCenter) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/recoveryservicessiterecovery/2023-04-01/targetcomputesizes/predicates.go b/resource-manager/recoveryservicessiterecovery/2023-04-01/targetcomputesizes/predicates.go
index 2ce6ae5b3fc..e884ca4906e 100644
--- a/resource-manager/recoveryservicessiterecovery/2023-04-01/targetcomputesizes/predicates.go
+++ b/resource-manager/recoveryservicessiterecovery/2023-04-01/targetcomputesizes/predicates.go
@@ -11,15 +11,15 @@ type TargetComputeSizeOperationPredicate struct {
 
 func (p TargetComputeSizeOperationPredicate) Matches(input TargetComputeSize) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/redhatopenshift/2022-04-01/openshiftclusters/predicates.go b/resource-manager/redhatopenshift/2022-04-01/openshiftclusters/predicates.go
index cedea5fc35a..b28a5926b0a 100644
--- a/resource-manager/redhatopenshift/2022-04-01/openshiftclusters/predicates.go
+++ b/resource-manager/redhatopenshift/2022-04-01/openshiftclusters/predicates.go
@@ -12,7 +12,7 @@ type OpenShiftClusterOperationPredicate struct {
 
 func (p OpenShiftClusterOperationPredicate) Matches(input OpenShiftCluster) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p OpenShiftClusterOperationPredicate) Matches(input OpenShiftCluster) bool
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/redhatopenshift/2022-09-04/machinepools/predicates.go b/resource-manager/redhatopenshift/2022-09-04/machinepools/predicates.go
index c0dfaf85bb6..0fd2046d5fa 100644
--- a/resource-manager/redhatopenshift/2022-09-04/machinepools/predicates.go
+++ b/resource-manager/redhatopenshift/2022-09-04/machinepools/predicates.go
@@ -11,15 +11,15 @@ type MachinePoolOperationPredicate struct {
 
 func (p MachinePoolOperationPredicate) Matches(input MachinePool) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/redhatopenshift/2022-09-04/openshiftclusters/predicates.go b/resource-manager/redhatopenshift/2022-09-04/openshiftclusters/predicates.go
index cedea5fc35a..b28a5926b0a 100644
--- a/resource-manager/redhatopenshift/2022-09-04/openshiftclusters/predicates.go
+++ b/resource-manager/redhatopenshift/2022-09-04/openshiftclusters/predicates.go
@@ -12,7 +12,7 @@ type OpenShiftClusterOperationPredicate struct {
 
 func (p OpenShiftClusterOperationPredicate) Matches(input OpenShiftCluster) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p OpenShiftClusterOperationPredicate) Matches(input OpenShiftCluster) bool
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/redhatopenshift/2022-09-04/openshiftversions/predicates.go b/resource-manager/redhatopenshift/2022-09-04/openshiftversions/predicates.go
index c88e7cd0c99..9027e325636 100644
--- a/resource-manager/redhatopenshift/2022-09-04/openshiftversions/predicates.go
+++ b/resource-manager/redhatopenshift/2022-09-04/openshiftversions/predicates.go
@@ -11,15 +11,15 @@ type OpenShiftVersionOperationPredicate struct {
 
 func (p OpenShiftVersionOperationPredicate) Matches(input OpenShiftVersion) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/redhatopenshift/2022-09-04/secrets/predicates.go b/resource-manager/redhatopenshift/2022-09-04/secrets/predicates.go
index 43057841bcd..7bff4879b50 100644
--- a/resource-manager/redhatopenshift/2022-09-04/secrets/predicates.go
+++ b/resource-manager/redhatopenshift/2022-09-04/secrets/predicates.go
@@ -11,15 +11,15 @@ type SecretOperationPredicate struct {
 
 func (p SecretOperationPredicate) Matches(input Secret) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/redhatopenshift/2022-09-04/syncidentityproviders/predicates.go b/resource-manager/redhatopenshift/2022-09-04/syncidentityproviders/predicates.go
index 339cb9e507e..e00dc02ddbd 100644
--- a/resource-manager/redhatopenshift/2022-09-04/syncidentityproviders/predicates.go
+++ b/resource-manager/redhatopenshift/2022-09-04/syncidentityproviders/predicates.go
@@ -11,15 +11,15 @@ type SyncIdentityProviderOperationPredicate struct {
 
 func (p SyncIdentityProviderOperationPredicate) Matches(input SyncIdentityProvider) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/redhatopenshift/2022-09-04/syncsets/predicates.go b/resource-manager/redhatopenshift/2022-09-04/syncsets/predicates.go
index c4c09f5aacb..9e79c9c05bb 100644
--- a/resource-manager/redhatopenshift/2022-09-04/syncsets/predicates.go
+++ b/resource-manager/redhatopenshift/2022-09-04/syncsets/predicates.go
@@ -11,15 +11,15 @@ type SyncSetOperationPredicate struct {
 
 func (p SyncSetOperationPredicate) Matches(input SyncSet) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/redhatopenshift/2023-04-01/machinepools/predicates.go b/resource-manager/redhatopenshift/2023-04-01/machinepools/predicates.go
index c0dfaf85bb6..0fd2046d5fa 100644
--- a/resource-manager/redhatopenshift/2023-04-01/machinepools/predicates.go
+++ b/resource-manager/redhatopenshift/2023-04-01/machinepools/predicates.go
@@ -11,15 +11,15 @@ type MachinePoolOperationPredicate struct {
 
 func (p MachinePoolOperationPredicate) Matches(input MachinePool) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/redhatopenshift/2023-04-01/openshiftclusters/predicates.go b/resource-manager/redhatopenshift/2023-04-01/openshiftclusters/predicates.go
index cedea5fc35a..b28a5926b0a 100644
--- a/resource-manager/redhatopenshift/2023-04-01/openshiftclusters/predicates.go
+++ b/resource-manager/redhatopenshift/2023-04-01/openshiftclusters/predicates.go
@@ -12,7 +12,7 @@ type OpenShiftClusterOperationPredicate struct {
 
 func (p OpenShiftClusterOperationPredicate) Matches(input OpenShiftCluster) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p OpenShiftClusterOperationPredicate) Matches(input OpenShiftCluster) bool
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/redhatopenshift/2023-04-01/openshiftversions/predicates.go b/resource-manager/redhatopenshift/2023-04-01/openshiftversions/predicates.go
index c88e7cd0c99..9027e325636 100644
--- a/resource-manager/redhatopenshift/2023-04-01/openshiftversions/predicates.go
+++ b/resource-manager/redhatopenshift/2023-04-01/openshiftversions/predicates.go
@@ -11,15 +11,15 @@ type OpenShiftVersionOperationPredicate struct {
 
 func (p OpenShiftVersionOperationPredicate) Matches(input OpenShiftVersion) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/redhatopenshift/2023-04-01/secrets/predicates.go b/resource-manager/redhatopenshift/2023-04-01/secrets/predicates.go
index 43057841bcd..7bff4879b50 100644
--- a/resource-manager/redhatopenshift/2023-04-01/secrets/predicates.go
+++ b/resource-manager/redhatopenshift/2023-04-01/secrets/predicates.go
@@ -11,15 +11,15 @@ type SecretOperationPredicate struct {
 
 func (p SecretOperationPredicate) Matches(input Secret) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/redhatopenshift/2023-04-01/syncidentityproviders/predicates.go b/resource-manager/redhatopenshift/2023-04-01/syncidentityproviders/predicates.go
index 339cb9e507e..e00dc02ddbd 100644
--- a/resource-manager/redhatopenshift/2023-04-01/syncidentityproviders/predicates.go
+++ b/resource-manager/redhatopenshift/2023-04-01/syncidentityproviders/predicates.go
@@ -11,15 +11,15 @@ type SyncIdentityProviderOperationPredicate struct {
 
 func (p SyncIdentityProviderOperationPredicate) Matches(input SyncIdentityProvider) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/redhatopenshift/2023-04-01/syncsets/predicates.go b/resource-manager/redhatopenshift/2023-04-01/syncsets/predicates.go
index c4c09f5aacb..9e79c9c05bb 100644
--- a/resource-manager/redhatopenshift/2023-04-01/syncsets/predicates.go
+++ b/resource-manager/redhatopenshift/2023-04-01/syncsets/predicates.go
@@ -11,15 +11,15 @@ type SyncSetOperationPredicate struct {
 
 func (p SyncSetOperationPredicate) Matches(input SyncSet) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/redis/2022-06-01/firewallrules/predicates.go b/resource-manager/redis/2022-06-01/firewallrules/predicates.go
index 71db32242ab..d94789d4458 100644
--- a/resource-manager/redis/2022-06-01/firewallrules/predicates.go
+++ b/resource-manager/redis/2022-06-01/firewallrules/predicates.go
@@ -11,15 +11,15 @@ type RedisFirewallRuleOperationPredicate struct {
 
 func (p RedisFirewallRuleOperationPredicate) Matches(input RedisFirewallRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/redis/2022-06-01/patchschedules/predicates.go b/resource-manager/redis/2022-06-01/patchschedules/predicates.go
index 68d24a97d80..f7891a60bbf 100644
--- a/resource-manager/redis/2022-06-01/patchschedules/predicates.go
+++ b/resource-manager/redis/2022-06-01/patchschedules/predicates.go
@@ -12,19 +12,19 @@ type RedisPatchScheduleOperationPredicate struct {
 
 func (p RedisPatchScheduleOperationPredicate) Matches(input RedisPatchSchedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/redis/2022-06-01/redis/predicates.go b/resource-manager/redis/2022-06-01/redis/predicates.go
index 7f122b3eaf2..d35468bd754 100644
--- a/resource-manager/redis/2022-06-01/redis/predicates.go
+++ b/resource-manager/redis/2022-06-01/redis/predicates.go
@@ -11,15 +11,15 @@ type RedisFirewallRuleOperationPredicate struct {
 
 func (p RedisFirewallRuleOperationPredicate) Matches(input RedisFirewallRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type RedisLinkedServerWithPropertiesOperationPredicate struct {
 
 func (p RedisLinkedServerWithPropertiesOperationPredicate) Matches(input RedisLinkedServerWithProperties) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -58,19 +58,19 @@ type RedisPatchScheduleOperationPredicate struct {
 
 func (p RedisPatchScheduleOperationPredicate) Matches(input RedisPatchSchedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -86,7 +86,7 @@ type RedisResourceOperationPredicate struct {
 
 func (p RedisResourceOperationPredicate) Matches(input RedisResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -94,11 +94,11 @@ func (p RedisResourceOperationPredicate) Matches(input RedisResource) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -112,11 +112,11 @@ type UpgradeNotificationOperationPredicate struct {
 
 func (p UpgradeNotificationOperationPredicate) Matches(input UpgradeNotification) bool {
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Timestamp != nil && (input.Timestamp == nil && *p.Timestamp != *input.Timestamp) {
+	if p.Timestamp != nil && (input.Timestamp == nil || *p.Timestamp != *input.Timestamp) {
 		return false
 	}
 
diff --git a/resource-manager/redis/2023-04-01/firewallrules/predicates.go b/resource-manager/redis/2023-04-01/firewallrules/predicates.go
index 71db32242ab..d94789d4458 100644
--- a/resource-manager/redis/2023-04-01/firewallrules/predicates.go
+++ b/resource-manager/redis/2023-04-01/firewallrules/predicates.go
@@ -11,15 +11,15 @@ type RedisFirewallRuleOperationPredicate struct {
 
 func (p RedisFirewallRuleOperationPredicate) Matches(input RedisFirewallRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/redis/2023-04-01/patchschedules/predicates.go b/resource-manager/redis/2023-04-01/patchschedules/predicates.go
index 68d24a97d80..f7891a60bbf 100644
--- a/resource-manager/redis/2023-04-01/patchschedules/predicates.go
+++ b/resource-manager/redis/2023-04-01/patchschedules/predicates.go
@@ -12,19 +12,19 @@ type RedisPatchScheduleOperationPredicate struct {
 
 func (p RedisPatchScheduleOperationPredicate) Matches(input RedisPatchSchedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/redis/2023-04-01/redis/predicates.go b/resource-manager/redis/2023-04-01/redis/predicates.go
index 7f122b3eaf2..d35468bd754 100644
--- a/resource-manager/redis/2023-04-01/redis/predicates.go
+++ b/resource-manager/redis/2023-04-01/redis/predicates.go
@@ -11,15 +11,15 @@ type RedisFirewallRuleOperationPredicate struct {
 
 func (p RedisFirewallRuleOperationPredicate) Matches(input RedisFirewallRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type RedisLinkedServerWithPropertiesOperationPredicate struct {
 
 func (p RedisLinkedServerWithPropertiesOperationPredicate) Matches(input RedisLinkedServerWithProperties) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -58,19 +58,19 @@ type RedisPatchScheduleOperationPredicate struct {
 
 func (p RedisPatchScheduleOperationPredicate) Matches(input RedisPatchSchedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -86,7 +86,7 @@ type RedisResourceOperationPredicate struct {
 
 func (p RedisResourceOperationPredicate) Matches(input RedisResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -94,11 +94,11 @@ func (p RedisResourceOperationPredicate) Matches(input RedisResource) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -112,11 +112,11 @@ type UpgradeNotificationOperationPredicate struct {
 
 func (p UpgradeNotificationOperationPredicate) Matches(input UpgradeNotification) bool {
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Timestamp != nil && (input.Timestamp == nil && *p.Timestamp != *input.Timestamp) {
+	if p.Timestamp != nil && (input.Timestamp == nil || *p.Timestamp != *input.Timestamp) {
 		return false
 	}
 
diff --git a/resource-manager/redisenterprise/2022-01-01/databases/predicates.go b/resource-manager/redisenterprise/2022-01-01/databases/predicates.go
index 76a8d6409f3..3d55136d0fb 100644
--- a/resource-manager/redisenterprise/2022-01-01/databases/predicates.go
+++ b/resource-manager/redisenterprise/2022-01-01/databases/predicates.go
@@ -11,15 +11,15 @@ type DatabaseOperationPredicate struct {
 
 func (p DatabaseOperationPredicate) Matches(input Database) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/redisenterprise/2022-01-01/redisenterprise/predicates.go b/resource-manager/redisenterprise/2022-01-01/redisenterprise/predicates.go
index 9f50bb00a92..d240cbf7181 100644
--- a/resource-manager/redisenterprise/2022-01-01/redisenterprise/predicates.go
+++ b/resource-manager/redisenterprise/2022-01-01/redisenterprise/predicates.go
@@ -12,7 +12,7 @@ type ClusterOperationPredicate struct {
 
 func (p ClusterOperationPredicate) Matches(input Cluster) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ClusterOperationPredicate) Matches(input Cluster) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -39,15 +39,15 @@ type DatabaseOperationPredicate struct {
 
 func (p DatabaseOperationPredicate) Matches(input Database) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/relay/2017-04-01/hybridconnections/predicates.go b/resource-manager/relay/2017-04-01/hybridconnections/predicates.go
index 34194b1f6e1..1c64b96d080 100644
--- a/resource-manager/relay/2017-04-01/hybridconnections/predicates.go
+++ b/resource-manager/relay/2017-04-01/hybridconnections/predicates.go
@@ -11,15 +11,15 @@ type AuthorizationRuleOperationPredicate struct {
 
 func (p AuthorizationRuleOperationPredicate) Matches(input AuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type HybridConnectionOperationPredicate struct {
 
 func (p HybridConnectionOperationPredicate) Matches(input HybridConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/relay/2017-04-01/namespaces/predicates.go b/resource-manager/relay/2017-04-01/namespaces/predicates.go
index 0bc96b654ae..84557386d9d 100644
--- a/resource-manager/relay/2017-04-01/namespaces/predicates.go
+++ b/resource-manager/relay/2017-04-01/namespaces/predicates.go
@@ -11,15 +11,15 @@ type AuthorizationRuleOperationPredicate struct {
 
 func (p AuthorizationRuleOperationPredicate) Matches(input AuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -35,7 +35,7 @@ type RelayNamespaceOperationPredicate struct {
 
 func (p RelayNamespaceOperationPredicate) Matches(input RelayNamespace) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -43,11 +43,11 @@ func (p RelayNamespaceOperationPredicate) Matches(input RelayNamespace) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/relay/2017-04-01/wcfrelays/predicates.go b/resource-manager/relay/2017-04-01/wcfrelays/predicates.go
index c6ca95e2ef3..3f85f9fdab6 100644
--- a/resource-manager/relay/2017-04-01/wcfrelays/predicates.go
+++ b/resource-manager/relay/2017-04-01/wcfrelays/predicates.go
@@ -11,15 +11,15 @@ type AuthorizationRuleOperationPredicate struct {
 
 func (p AuthorizationRuleOperationPredicate) Matches(input AuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type WcfRelayOperationPredicate struct {
 
 func (p WcfRelayOperationPredicate) Matches(input WcfRelay) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/relay/2021-11-01/hybridconnections/predicates.go b/resource-manager/relay/2021-11-01/hybridconnections/predicates.go
index 5f42e8e86eb..b9c36f7d93d 100644
--- a/resource-manager/relay/2021-11-01/hybridconnections/predicates.go
+++ b/resource-manager/relay/2021-11-01/hybridconnections/predicates.go
@@ -12,19 +12,19 @@ type AuthorizationRuleOperationPredicate struct {
 
 func (p AuthorizationRuleOperationPredicate) Matches(input AuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,19 +40,19 @@ type HybridConnectionOperationPredicate struct {
 
 func (p HybridConnectionOperationPredicate) Matches(input HybridConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/relay/2021-11-01/namespaces/predicates.go b/resource-manager/relay/2021-11-01/namespaces/predicates.go
index 7d4f3ec593a..28421545fd7 100644
--- a/resource-manager/relay/2021-11-01/namespaces/predicates.go
+++ b/resource-manager/relay/2021-11-01/namespaces/predicates.go
@@ -12,19 +12,19 @@ type AuthorizationRuleOperationPredicate struct {
 
 func (p AuthorizationRuleOperationPredicate) Matches(input AuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,7 +40,7 @@ type RelayNamespaceOperationPredicate struct {
 
 func (p RelayNamespaceOperationPredicate) Matches(input RelayNamespace) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -48,11 +48,11 @@ func (p RelayNamespaceOperationPredicate) Matches(input RelayNamespace) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/relay/2021-11-01/namespacesprivateendpointconnections/predicates.go b/resource-manager/relay/2021-11-01/namespacesprivateendpointconnections/predicates.go
index 5a8a3fa3b56..f1b8f930ec1 100644
--- a/resource-manager/relay/2021-11-01/namespacesprivateendpointconnections/predicates.go
+++ b/resource-manager/relay/2021-11-01/namespacesprivateendpointconnections/predicates.go
@@ -12,19 +12,19 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/relay/2021-11-01/wcfrelays/predicates.go b/resource-manager/relay/2021-11-01/wcfrelays/predicates.go
index 24ac41ebecf..996469205f1 100644
--- a/resource-manager/relay/2021-11-01/wcfrelays/predicates.go
+++ b/resource-manager/relay/2021-11-01/wcfrelays/predicates.go
@@ -12,19 +12,19 @@ type AuthorizationRuleOperationPredicate struct {
 
 func (p AuthorizationRuleOperationPredicate) Matches(input AuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,19 +40,19 @@ type WcfRelayOperationPredicate struct {
 
 func (p WcfRelayOperationPredicate) Matches(input WcfRelay) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/resourceconnector/2022-10-27/appliances/predicates.go b/resource-manager/resourceconnector/2022-10-27/appliances/predicates.go
index 6100584c3ba..748f0086d85 100644
--- a/resource-manager/resourceconnector/2022-10-27/appliances/predicates.go
+++ b/resource-manager/resourceconnector/2022-10-27/appliances/predicates.go
@@ -12,7 +12,7 @@ type ApplianceOperationPredicate struct {
 
 func (p ApplianceOperationPredicate) Matches(input Appliance) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ApplianceOperationPredicate) Matches(input Appliance) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2020-05-01/managementlocks/predicates.go b/resource-manager/resources/2020-05-01/managementlocks/predicates.go
index 4d080a55fd5..9d0dbe1439c 100644
--- a/resource-manager/resources/2020-05-01/managementlocks/predicates.go
+++ b/resource-manager/resources/2020-05-01/managementlocks/predicates.go
@@ -11,15 +11,15 @@ type ManagementLockObjectOperationPredicate struct {
 
 func (p ManagementLockObjectOperationPredicate) Matches(input ManagementLockObject) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2020-06-01/deploymentoperations/predicates.go b/resource-manager/resources/2020-06-01/deploymentoperations/predicates.go
index 9513d7c3667..8481a87fa68 100644
--- a/resource-manager/resources/2020-06-01/deploymentoperations/predicates.go
+++ b/resource-manager/resources/2020-06-01/deploymentoperations/predicates.go
@@ -10,11 +10,11 @@ type DeploymentOperationOperationPredicate struct {
 
 func (p DeploymentOperationOperationPredicate) Matches(input DeploymentOperation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.OperationId != nil && (input.OperationId == nil && *p.OperationId != *input.OperationId) {
+	if p.OperationId != nil && (input.OperationId == nil || *p.OperationId != *input.OperationId) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2020-06-01/deployments/predicates.go b/resource-manager/resources/2020-06-01/deployments/predicates.go
index 0398f4a1012..84e14eb0c22 100644
--- a/resource-manager/resources/2020-06-01/deployments/predicates.go
+++ b/resource-manager/resources/2020-06-01/deployments/predicates.go
@@ -12,19 +12,19 @@ type DeploymentExtendedOperationPredicate struct {
 
 func (p DeploymentExtendedOperationPredicate) Matches(input DeploymentExtended) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2020-06-01/providers/predicates.go b/resource-manager/resources/2020-06-01/providers/predicates.go
index fff4f09e0d3..b02660b4826 100644
--- a/resource-manager/resources/2020-06-01/providers/predicates.go
+++ b/resource-manager/resources/2020-06-01/providers/predicates.go
@@ -12,19 +12,19 @@ type ProviderOperationPredicate struct {
 
 func (p ProviderOperationPredicate) Matches(input Provider) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Namespace != nil && (input.Namespace == nil && *p.Namespace != *input.Namespace) {
+	if p.Namespace != nil && (input.Namespace == nil || *p.Namespace != *input.Namespace) {
 		return false
 	}
 
-	if p.RegistrationPolicy != nil && (input.RegistrationPolicy == nil && *p.RegistrationPolicy != *input.RegistrationPolicy) {
+	if p.RegistrationPolicy != nil && (input.RegistrationPolicy == nil || *p.RegistrationPolicy != *input.RegistrationPolicy) {
 		return false
 	}
 
-	if p.RegistrationState != nil && (input.RegistrationState == nil && *p.RegistrationState != *input.RegistrationState) {
+	if p.RegistrationState != nil && (input.RegistrationState == nil || *p.RegistrationState != *input.RegistrationState) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2020-06-01/resourcegroups/predicates.go b/resource-manager/resources/2020-06-01/resourcegroups/predicates.go
index cb9e5b3a553..dfc76d5202b 100644
--- a/resource-manager/resources/2020-06-01/resourcegroups/predicates.go
+++ b/resource-manager/resources/2020-06-01/resourcegroups/predicates.go
@@ -18,43 +18,43 @@ type GenericResourceExpandedOperationPredicate struct {
 
 func (p GenericResourceExpandedOperationPredicate) Matches(input GenericResourceExpanded) bool {
 
-	if p.ChangedTime != nil && (input.ChangedTime == nil && *p.ChangedTime != *input.ChangedTime) {
+	if p.ChangedTime != nil && (input.ChangedTime == nil || *p.ChangedTime != *input.ChangedTime) {
 		return false
 	}
 
-	if p.CreatedTime != nil && (input.CreatedTime == nil && *p.CreatedTime != *input.CreatedTime) {
+	if p.CreatedTime != nil && (input.CreatedTime == nil || *p.CreatedTime != *input.CreatedTime) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Properties != nil && (input.Properties == nil && *p.Properties != *input.Properties) {
+	if p.Properties != nil && (input.Properties == nil || *p.Properties != *input.Properties) {
 		return false
 	}
 
-	if p.ProvisioningState != nil && (input.ProvisioningState == nil && *p.ProvisioningState != *input.ProvisioningState) {
+	if p.ProvisioningState != nil && (input.ProvisioningState == nil || *p.ProvisioningState != *input.ProvisioningState) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -71,7 +71,7 @@ type ResourceGroupOperationPredicate struct {
 
 func (p ResourceGroupOperationPredicate) Matches(input ResourceGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -79,15 +79,15 @@ func (p ResourceGroupOperationPredicate) Matches(input ResourceGroup) bool {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2020-06-01/resources/predicates.go b/resource-manager/resources/2020-06-01/resources/predicates.go
index 402db3912a2..cfa7a99b864 100644
--- a/resource-manager/resources/2020-06-01/resources/predicates.go
+++ b/resource-manager/resources/2020-06-01/resources/predicates.go
@@ -18,43 +18,43 @@ type GenericResourceExpandedOperationPredicate struct {
 
 func (p GenericResourceExpandedOperationPredicate) Matches(input GenericResourceExpanded) bool {
 
-	if p.ChangedTime != nil && (input.ChangedTime == nil && *p.ChangedTime != *input.ChangedTime) {
+	if p.ChangedTime != nil && (input.ChangedTime == nil || *p.ChangedTime != *input.ChangedTime) {
 		return false
 	}
 
-	if p.CreatedTime != nil && (input.CreatedTime == nil && *p.CreatedTime != *input.CreatedTime) {
+	if p.CreatedTime != nil && (input.CreatedTime == nil || *p.CreatedTime != *input.CreatedTime) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Properties != nil && (input.Properties == nil && *p.Properties != *input.Properties) {
+	if p.Properties != nil && (input.Properties == nil || *p.Properties != *input.Properties) {
 		return false
 	}
 
-	if p.ProvisioningState != nil && (input.ProvisioningState == nil && *p.ProvisioningState != *input.ProvisioningState) {
+	if p.ProvisioningState != nil && (input.ProvisioningState == nil || *p.ProvisioningState != *input.ProvisioningState) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2020-10-01/deploymentoperations/predicates.go b/resource-manager/resources/2020-10-01/deploymentoperations/predicates.go
index 9513d7c3667..8481a87fa68 100644
--- a/resource-manager/resources/2020-10-01/deploymentoperations/predicates.go
+++ b/resource-manager/resources/2020-10-01/deploymentoperations/predicates.go
@@ -10,11 +10,11 @@ type DeploymentOperationOperationPredicate struct {
 
 func (p DeploymentOperationOperationPredicate) Matches(input DeploymentOperation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.OperationId != nil && (input.OperationId == nil && *p.OperationId != *input.OperationId) {
+	if p.OperationId != nil && (input.OperationId == nil || *p.OperationId != *input.OperationId) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2020-10-01/deployments/predicates.go b/resource-manager/resources/2020-10-01/deployments/predicates.go
index 0398f4a1012..84e14eb0c22 100644
--- a/resource-manager/resources/2020-10-01/deployments/predicates.go
+++ b/resource-manager/resources/2020-10-01/deployments/predicates.go
@@ -12,19 +12,19 @@ type DeploymentExtendedOperationPredicate struct {
 
 func (p DeploymentExtendedOperationPredicate) Matches(input DeploymentExtended) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2020-10-01/providers/predicates.go b/resource-manager/resources/2020-10-01/providers/predicates.go
index fff4f09e0d3..b02660b4826 100644
--- a/resource-manager/resources/2020-10-01/providers/predicates.go
+++ b/resource-manager/resources/2020-10-01/providers/predicates.go
@@ -12,19 +12,19 @@ type ProviderOperationPredicate struct {
 
 func (p ProviderOperationPredicate) Matches(input Provider) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Namespace != nil && (input.Namespace == nil && *p.Namespace != *input.Namespace) {
+	if p.Namespace != nil && (input.Namespace == nil || *p.Namespace != *input.Namespace) {
 		return false
 	}
 
-	if p.RegistrationPolicy != nil && (input.RegistrationPolicy == nil && *p.RegistrationPolicy != *input.RegistrationPolicy) {
+	if p.RegistrationPolicy != nil && (input.RegistrationPolicy == nil || *p.RegistrationPolicy != *input.RegistrationPolicy) {
 		return false
 	}
 
-	if p.RegistrationState != nil && (input.RegistrationState == nil && *p.RegistrationState != *input.RegistrationState) {
+	if p.RegistrationState != nil && (input.RegistrationState == nil || *p.RegistrationState != *input.RegistrationState) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2020-10-01/resourcegroups/predicates.go b/resource-manager/resources/2020-10-01/resourcegroups/predicates.go
index cb9e5b3a553..dfc76d5202b 100644
--- a/resource-manager/resources/2020-10-01/resourcegroups/predicates.go
+++ b/resource-manager/resources/2020-10-01/resourcegroups/predicates.go
@@ -18,43 +18,43 @@ type GenericResourceExpandedOperationPredicate struct {
 
 func (p GenericResourceExpandedOperationPredicate) Matches(input GenericResourceExpanded) bool {
 
-	if p.ChangedTime != nil && (input.ChangedTime == nil && *p.ChangedTime != *input.ChangedTime) {
+	if p.ChangedTime != nil && (input.ChangedTime == nil || *p.ChangedTime != *input.ChangedTime) {
 		return false
 	}
 
-	if p.CreatedTime != nil && (input.CreatedTime == nil && *p.CreatedTime != *input.CreatedTime) {
+	if p.CreatedTime != nil && (input.CreatedTime == nil || *p.CreatedTime != *input.CreatedTime) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Properties != nil && (input.Properties == nil && *p.Properties != *input.Properties) {
+	if p.Properties != nil && (input.Properties == nil || *p.Properties != *input.Properties) {
 		return false
 	}
 
-	if p.ProvisioningState != nil && (input.ProvisioningState == nil && *p.ProvisioningState != *input.ProvisioningState) {
+	if p.ProvisioningState != nil && (input.ProvisioningState == nil || *p.ProvisioningState != *input.ProvisioningState) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -71,7 +71,7 @@ type ResourceGroupOperationPredicate struct {
 
 func (p ResourceGroupOperationPredicate) Matches(input ResourceGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -79,15 +79,15 @@ func (p ResourceGroupOperationPredicate) Matches(input ResourceGroup) bool {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2020-10-01/resources/predicates.go b/resource-manager/resources/2020-10-01/resources/predicates.go
index 402db3912a2..cfa7a99b864 100644
--- a/resource-manager/resources/2020-10-01/resources/predicates.go
+++ b/resource-manager/resources/2020-10-01/resources/predicates.go
@@ -18,43 +18,43 @@ type GenericResourceExpandedOperationPredicate struct {
 
 func (p GenericResourceExpandedOperationPredicate) Matches(input GenericResourceExpanded) bool {
 
-	if p.ChangedTime != nil && (input.ChangedTime == nil && *p.ChangedTime != *input.ChangedTime) {
+	if p.ChangedTime != nil && (input.ChangedTime == nil || *p.ChangedTime != *input.ChangedTime) {
 		return false
 	}
 
-	if p.CreatedTime != nil && (input.CreatedTime == nil && *p.CreatedTime != *input.CreatedTime) {
+	if p.CreatedTime != nil && (input.CreatedTime == nil || *p.CreatedTime != *input.CreatedTime) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Properties != nil && (input.Properties == nil && *p.Properties != *input.Properties) {
+	if p.Properties != nil && (input.Properties == nil || *p.Properties != *input.Properties) {
 		return false
 	}
 
-	if p.ProvisioningState != nil && (input.ProvisioningState == nil && *p.ProvisioningState != *input.ProvisioningState) {
+	if p.ProvisioningState != nil && (input.ProvisioningState == nil || *p.ProvisioningState != *input.ProvisioningState) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2021-04-01/deploymentoperations/predicates.go b/resource-manager/resources/2021-04-01/deploymentoperations/predicates.go
index 9513d7c3667..8481a87fa68 100644
--- a/resource-manager/resources/2021-04-01/deploymentoperations/predicates.go
+++ b/resource-manager/resources/2021-04-01/deploymentoperations/predicates.go
@@ -10,11 +10,11 @@ type DeploymentOperationOperationPredicate struct {
 
 func (p DeploymentOperationOperationPredicate) Matches(input DeploymentOperation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.OperationId != nil && (input.OperationId == nil && *p.OperationId != *input.OperationId) {
+	if p.OperationId != nil && (input.OperationId == nil || *p.OperationId != *input.OperationId) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2021-04-01/deployments/predicates.go b/resource-manager/resources/2021-04-01/deployments/predicates.go
index 0398f4a1012..84e14eb0c22 100644
--- a/resource-manager/resources/2021-04-01/deployments/predicates.go
+++ b/resource-manager/resources/2021-04-01/deployments/predicates.go
@@ -12,19 +12,19 @@ type DeploymentExtendedOperationPredicate struct {
 
 func (p DeploymentExtendedOperationPredicate) Matches(input DeploymentExtended) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2021-04-01/providers/predicates.go b/resource-manager/resources/2021-04-01/providers/predicates.go
index fff4f09e0d3..b02660b4826 100644
--- a/resource-manager/resources/2021-04-01/providers/predicates.go
+++ b/resource-manager/resources/2021-04-01/providers/predicates.go
@@ -12,19 +12,19 @@ type ProviderOperationPredicate struct {
 
 func (p ProviderOperationPredicate) Matches(input Provider) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Namespace != nil && (input.Namespace == nil && *p.Namespace != *input.Namespace) {
+	if p.Namespace != nil && (input.Namespace == nil || *p.Namespace != *input.Namespace) {
 		return false
 	}
 
-	if p.RegistrationPolicy != nil && (input.RegistrationPolicy == nil && *p.RegistrationPolicy != *input.RegistrationPolicy) {
+	if p.RegistrationPolicy != nil && (input.RegistrationPolicy == nil || *p.RegistrationPolicy != *input.RegistrationPolicy) {
 		return false
 	}
 
-	if p.RegistrationState != nil && (input.RegistrationState == nil && *p.RegistrationState != *input.RegistrationState) {
+	if p.RegistrationState != nil && (input.RegistrationState == nil || *p.RegistrationState != *input.RegistrationState) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2021-04-01/resourcegroups/predicates.go b/resource-manager/resources/2021-04-01/resourcegroups/predicates.go
index cb9e5b3a553..dfc76d5202b 100644
--- a/resource-manager/resources/2021-04-01/resourcegroups/predicates.go
+++ b/resource-manager/resources/2021-04-01/resourcegroups/predicates.go
@@ -18,43 +18,43 @@ type GenericResourceExpandedOperationPredicate struct {
 
 func (p GenericResourceExpandedOperationPredicate) Matches(input GenericResourceExpanded) bool {
 
-	if p.ChangedTime != nil && (input.ChangedTime == nil && *p.ChangedTime != *input.ChangedTime) {
+	if p.ChangedTime != nil && (input.ChangedTime == nil || *p.ChangedTime != *input.ChangedTime) {
 		return false
 	}
 
-	if p.CreatedTime != nil && (input.CreatedTime == nil && *p.CreatedTime != *input.CreatedTime) {
+	if p.CreatedTime != nil && (input.CreatedTime == nil || *p.CreatedTime != *input.CreatedTime) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Properties != nil && (input.Properties == nil && *p.Properties != *input.Properties) {
+	if p.Properties != nil && (input.Properties == nil || *p.Properties != *input.Properties) {
 		return false
 	}
 
-	if p.ProvisioningState != nil && (input.ProvisioningState == nil && *p.ProvisioningState != *input.ProvisioningState) {
+	if p.ProvisioningState != nil && (input.ProvisioningState == nil || *p.ProvisioningState != *input.ProvisioningState) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -71,7 +71,7 @@ type ResourceGroupOperationPredicate struct {
 
 func (p ResourceGroupOperationPredicate) Matches(input ResourceGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -79,15 +79,15 @@ func (p ResourceGroupOperationPredicate) Matches(input ResourceGroup) bool {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2021-04-01/resources/predicates.go b/resource-manager/resources/2021-04-01/resources/predicates.go
index 402db3912a2..cfa7a99b864 100644
--- a/resource-manager/resources/2021-04-01/resources/predicates.go
+++ b/resource-manager/resources/2021-04-01/resources/predicates.go
@@ -18,43 +18,43 @@ type GenericResourceExpandedOperationPredicate struct {
 
 func (p GenericResourceExpandedOperationPredicate) Matches(input GenericResourceExpanded) bool {
 
-	if p.ChangedTime != nil && (input.ChangedTime == nil && *p.ChangedTime != *input.ChangedTime) {
+	if p.ChangedTime != nil && (input.ChangedTime == nil || *p.ChangedTime != *input.ChangedTime) {
 		return false
 	}
 
-	if p.CreatedTime != nil && (input.CreatedTime == nil && *p.CreatedTime != *input.CreatedTime) {
+	if p.CreatedTime != nil && (input.CreatedTime == nil || *p.CreatedTime != *input.CreatedTime) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Properties != nil && (input.Properties == nil && *p.Properties != *input.Properties) {
+	if p.Properties != nil && (input.Properties == nil || *p.Properties != *input.Properties) {
 		return false
 	}
 
-	if p.ProvisioningState != nil && (input.ProvisioningState == nil && *p.ProvisioningState != *input.ProvisioningState) {
+	if p.ProvisioningState != nil && (input.ProvisioningState == nil || *p.ProvisioningState != *input.ProvisioningState) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2021-06-01/policyassignments/predicates.go b/resource-manager/resources/2021-06-01/policyassignments/predicates.go
index 25fafd249a6..93f39469c95 100644
--- a/resource-manager/resources/2021-06-01/policyassignments/predicates.go
+++ b/resource-manager/resources/2021-06-01/policyassignments/predicates.go
@@ -12,19 +12,19 @@ type PolicyAssignmentOperationPredicate struct {
 
 func (p PolicyAssignmentOperationPredicate) Matches(input PolicyAssignment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2021-06-01/policydefinitions/predicates.go b/resource-manager/resources/2021-06-01/policydefinitions/predicates.go
index f5131087b07..41e1ad64139 100644
--- a/resource-manager/resources/2021-06-01/policydefinitions/predicates.go
+++ b/resource-manager/resources/2021-06-01/policydefinitions/predicates.go
@@ -11,15 +11,15 @@ type PolicyDefinitionOperationPredicate struct {
 
 func (p PolicyDefinitionOperationPredicate) Matches(input PolicyDefinition) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2021-06-01/policysetdefinitions/predicates.go b/resource-manager/resources/2021-06-01/policysetdefinitions/predicates.go
index 5d25fddf7f9..5466ffd65ff 100644
--- a/resource-manager/resources/2021-06-01/policysetdefinitions/predicates.go
+++ b/resource-manager/resources/2021-06-01/policysetdefinitions/predicates.go
@@ -11,15 +11,15 @@ type PolicySetDefinitionOperationPredicate struct {
 
 func (p PolicySetDefinitionOperationPredicate) Matches(input PolicySetDefinition) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2022-06-01/policyassignments/predicates.go b/resource-manager/resources/2022-06-01/policyassignments/predicates.go
index 25fafd249a6..93f39469c95 100644
--- a/resource-manager/resources/2022-06-01/policyassignments/predicates.go
+++ b/resource-manager/resources/2022-06-01/policyassignments/predicates.go
@@ -12,19 +12,19 @@ type PolicyAssignmentOperationPredicate struct {
 
 func (p PolicyAssignmentOperationPredicate) Matches(input PolicyAssignment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2022-07-01-preview/policyexemptions/predicates.go b/resource-manager/resources/2022-07-01-preview/policyexemptions/predicates.go
index c4e363f3984..4f6ac45eeea 100644
--- a/resource-manager/resources/2022-07-01-preview/policyexemptions/predicates.go
+++ b/resource-manager/resources/2022-07-01-preview/policyexemptions/predicates.go
@@ -11,15 +11,15 @@ type PolicyExemptionOperationPredicate struct {
 
 func (p PolicyExemptionOperationPredicate) Matches(input PolicyExemption) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2022-09-01/deploymentoperations/predicates.go b/resource-manager/resources/2022-09-01/deploymentoperations/predicates.go
index 9513d7c3667..8481a87fa68 100644
--- a/resource-manager/resources/2022-09-01/deploymentoperations/predicates.go
+++ b/resource-manager/resources/2022-09-01/deploymentoperations/predicates.go
@@ -10,11 +10,11 @@ type DeploymentOperationOperationPredicate struct {
 
 func (p DeploymentOperationOperationPredicate) Matches(input DeploymentOperation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.OperationId != nil && (input.OperationId == nil && *p.OperationId != *input.OperationId) {
+	if p.OperationId != nil && (input.OperationId == nil || *p.OperationId != *input.OperationId) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2022-09-01/deployments/predicates.go b/resource-manager/resources/2022-09-01/deployments/predicates.go
index 0398f4a1012..84e14eb0c22 100644
--- a/resource-manager/resources/2022-09-01/deployments/predicates.go
+++ b/resource-manager/resources/2022-09-01/deployments/predicates.go
@@ -12,19 +12,19 @@ type DeploymentExtendedOperationPredicate struct {
 
 func (p DeploymentExtendedOperationPredicate) Matches(input DeploymentExtended) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2022-09-01/providers/predicates.go b/resource-manager/resources/2022-09-01/providers/predicates.go
index fff4f09e0d3..b02660b4826 100644
--- a/resource-manager/resources/2022-09-01/providers/predicates.go
+++ b/resource-manager/resources/2022-09-01/providers/predicates.go
@@ -12,19 +12,19 @@ type ProviderOperationPredicate struct {
 
 func (p ProviderOperationPredicate) Matches(input Provider) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Namespace != nil && (input.Namespace == nil && *p.Namespace != *input.Namespace) {
+	if p.Namespace != nil && (input.Namespace == nil || *p.Namespace != *input.Namespace) {
 		return false
 	}
 
-	if p.RegistrationPolicy != nil && (input.RegistrationPolicy == nil && *p.RegistrationPolicy != *input.RegistrationPolicy) {
+	if p.RegistrationPolicy != nil && (input.RegistrationPolicy == nil || *p.RegistrationPolicy != *input.RegistrationPolicy) {
 		return false
 	}
 
-	if p.RegistrationState != nil && (input.RegistrationState == nil && *p.RegistrationState != *input.RegistrationState) {
+	if p.RegistrationState != nil && (input.RegistrationState == nil || *p.RegistrationState != *input.RegistrationState) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2022-09-01/resourcegroups/predicates.go b/resource-manager/resources/2022-09-01/resourcegroups/predicates.go
index cb9e5b3a553..dfc76d5202b 100644
--- a/resource-manager/resources/2022-09-01/resourcegroups/predicates.go
+++ b/resource-manager/resources/2022-09-01/resourcegroups/predicates.go
@@ -18,43 +18,43 @@ type GenericResourceExpandedOperationPredicate struct {
 
 func (p GenericResourceExpandedOperationPredicate) Matches(input GenericResourceExpanded) bool {
 
-	if p.ChangedTime != nil && (input.ChangedTime == nil && *p.ChangedTime != *input.ChangedTime) {
+	if p.ChangedTime != nil && (input.ChangedTime == nil || *p.ChangedTime != *input.ChangedTime) {
 		return false
 	}
 
-	if p.CreatedTime != nil && (input.CreatedTime == nil && *p.CreatedTime != *input.CreatedTime) {
+	if p.CreatedTime != nil && (input.CreatedTime == nil || *p.CreatedTime != *input.CreatedTime) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Properties != nil && (input.Properties == nil && *p.Properties != *input.Properties) {
+	if p.Properties != nil && (input.Properties == nil || *p.Properties != *input.Properties) {
 		return false
 	}
 
-	if p.ProvisioningState != nil && (input.ProvisioningState == nil && *p.ProvisioningState != *input.ProvisioningState) {
+	if p.ProvisioningState != nil && (input.ProvisioningState == nil || *p.ProvisioningState != *input.ProvisioningState) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -71,7 +71,7 @@ type ResourceGroupOperationPredicate struct {
 
 func (p ResourceGroupOperationPredicate) Matches(input ResourceGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -79,15 +79,15 @@ func (p ResourceGroupOperationPredicate) Matches(input ResourceGroup) bool {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2022-09-01/resources/predicates.go b/resource-manager/resources/2022-09-01/resources/predicates.go
index 402db3912a2..cfa7a99b864 100644
--- a/resource-manager/resources/2022-09-01/resources/predicates.go
+++ b/resource-manager/resources/2022-09-01/resources/predicates.go
@@ -18,43 +18,43 @@ type GenericResourceExpandedOperationPredicate struct {
 
 func (p GenericResourceExpandedOperationPredicate) Matches(input GenericResourceExpanded) bool {
 
-	if p.ChangedTime != nil && (input.ChangedTime == nil && *p.ChangedTime != *input.ChangedTime) {
+	if p.ChangedTime != nil && (input.ChangedTime == nil || *p.ChangedTime != *input.ChangedTime) {
 		return false
 	}
 
-	if p.CreatedTime != nil && (input.CreatedTime == nil && *p.CreatedTime != *input.CreatedTime) {
+	if p.CreatedTime != nil && (input.CreatedTime == nil || *p.CreatedTime != *input.CreatedTime) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Properties != nil && (input.Properties == nil && *p.Properties != *input.Properties) {
+	if p.Properties != nil && (input.Properties == nil || *p.Properties != *input.Properties) {
 		return false
 	}
 
-	if p.ProvisioningState != nil && (input.ProvisioningState == nil && *p.ProvisioningState != *input.ProvisioningState) {
+	if p.ProvisioningState != nil && (input.ProvisioningState == nil || *p.ProvisioningState != *input.ProvisioningState) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2022-12-01/subscriptions/predicates.go b/resource-manager/resources/2022-12-01/subscriptions/predicates.go
index 036ed32f6c7..530385c2544 100644
--- a/resource-manager/resources/2022-12-01/subscriptions/predicates.go
+++ b/resource-manager/resources/2022-12-01/subscriptions/predicates.go
@@ -13,23 +13,23 @@ type SubscriptionOperationPredicate struct {
 
 func (p SubscriptionOperationPredicate) Matches(input Subscription) bool {
 
-	if p.AuthorizationSource != nil && (input.AuthorizationSource == nil && *p.AuthorizationSource != *input.AuthorizationSource) {
+	if p.AuthorizationSource != nil && (input.AuthorizationSource == nil || *p.AuthorizationSource != *input.AuthorizationSource) {
 		return false
 	}
 
-	if p.DisplayName != nil && (input.DisplayName == nil && *p.DisplayName != *input.DisplayName) {
+	if p.DisplayName != nil && (input.DisplayName == nil || *p.DisplayName != *input.DisplayName) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.SubscriptionId != nil && (input.SubscriptionId == nil && *p.SubscriptionId != *input.SubscriptionId) {
+	if p.SubscriptionId != nil && (input.SubscriptionId == nil || *p.SubscriptionId != *input.SubscriptionId) {
 		return false
 	}
 
-	if p.TenantId != nil && (input.TenantId == nil && *p.TenantId != *input.TenantId) {
+	if p.TenantId != nil && (input.TenantId == nil || *p.TenantId != *input.TenantId) {
 		return false
 	}
 
diff --git a/resource-manager/resources/2022-12-01/tenants/predicates.go b/resource-manager/resources/2022-12-01/tenants/predicates.go
index 902c8e0bfd3..8a3771855af 100644
--- a/resource-manager/resources/2022-12-01/tenants/predicates.go
+++ b/resource-manager/resources/2022-12-01/tenants/predicates.go
@@ -16,35 +16,35 @@ type TenantIdDescriptionOperationPredicate struct {
 
 func (p TenantIdDescriptionOperationPredicate) Matches(input TenantIdDescription) bool {
 
-	if p.Country != nil && (input.Country == nil && *p.Country != *input.Country) {
+	if p.Country != nil && (input.Country == nil || *p.Country != *input.Country) {
 		return false
 	}
 
-	if p.CountryCode != nil && (input.CountryCode == nil && *p.CountryCode != *input.CountryCode) {
+	if p.CountryCode != nil && (input.CountryCode == nil || *p.CountryCode != *input.CountryCode) {
 		return false
 	}
 
-	if p.DefaultDomain != nil && (input.DefaultDomain == nil && *p.DefaultDomain != *input.DefaultDomain) {
+	if p.DefaultDomain != nil && (input.DefaultDomain == nil || *p.DefaultDomain != *input.DefaultDomain) {
 		return false
 	}
 
-	if p.DisplayName != nil && (input.DisplayName == nil && *p.DisplayName != *input.DisplayName) {
+	if p.DisplayName != nil && (input.DisplayName == nil || *p.DisplayName != *input.DisplayName) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.TenantBrandingLogoUrl != nil && (input.TenantBrandingLogoUrl == nil && *p.TenantBrandingLogoUrl != *input.TenantBrandingLogoUrl) {
+	if p.TenantBrandingLogoUrl != nil && (input.TenantBrandingLogoUrl == nil || *p.TenantBrandingLogoUrl != *input.TenantBrandingLogoUrl) {
 		return false
 	}
 
-	if p.TenantId != nil && (input.TenantId == nil && *p.TenantId != *input.TenantId) {
+	if p.TenantId != nil && (input.TenantId == nil || *p.TenantId != *input.TenantId) {
 		return false
 	}
 
-	if p.TenantType != nil && (input.TenantType == nil && *p.TenantType != *input.TenantType) {
+	if p.TenantType != nil && (input.TenantType == nil || *p.TenantType != *input.TenantType) {
 		return false
 	}
 
diff --git a/resource-manager/search/2022-09-01/privateendpointconnections/predicates.go b/resource-manager/search/2022-09-01/privateendpointconnections/predicates.go
index bea3f66b397..4a03a91ce52 100644
--- a/resource-manager/search/2022-09-01/privateendpointconnections/predicates.go
+++ b/resource-manager/search/2022-09-01/privateendpointconnections/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/search/2022-09-01/querykeys/predicates.go b/resource-manager/search/2022-09-01/querykeys/predicates.go
index d3a5e027f03..6287d6738be 100644
--- a/resource-manager/search/2022-09-01/querykeys/predicates.go
+++ b/resource-manager/search/2022-09-01/querykeys/predicates.go
@@ -10,11 +10,11 @@ type QueryKeyOperationPredicate struct {
 
 func (p QueryKeyOperationPredicate) Matches(input QueryKey) bool {
 
-	if p.Key != nil && (input.Key == nil && *p.Key != *input.Key) {
+	if p.Key != nil && (input.Key == nil || *p.Key != *input.Key) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/search/2022-09-01/services/predicates.go b/resource-manager/search/2022-09-01/services/predicates.go
index ea65031495d..8743fe1ac71 100644
--- a/resource-manager/search/2022-09-01/services/predicates.go
+++ b/resource-manager/search/2022-09-01/services/predicates.go
@@ -12,7 +12,7 @@ type SearchServiceOperationPredicate struct {
 
 func (p SearchServiceOperationPredicate) Matches(input SearchService) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SearchServiceOperationPredicate) Matches(input SearchService) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/search/2022-09-01/sharedprivatelinkresources/predicates.go b/resource-manager/search/2022-09-01/sharedprivatelinkresources/predicates.go
index b9885f90ab5..b4d0b794bcb 100644
--- a/resource-manager/search/2022-09-01/sharedprivatelinkresources/predicates.go
+++ b/resource-manager/search/2022-09-01/sharedprivatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type SharedPrivateLinkResourceOperationPredicate struct {
 
 func (p SharedPrivateLinkResourceOperationPredicate) Matches(input SharedPrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2017-08-01-preview/autoprovisioningsettings/predicates.go b/resource-manager/security/2017-08-01-preview/autoprovisioningsettings/predicates.go
index cc91826825e..fc0aadec9a4 100644
--- a/resource-manager/security/2017-08-01-preview/autoprovisioningsettings/predicates.go
+++ b/resource-manager/security/2017-08-01-preview/autoprovisioningsettings/predicates.go
@@ -11,15 +11,15 @@ type AutoProvisioningSettingOperationPredicate struct {
 
 func (p AutoProvisioningSettingOperationPredicate) Matches(input AutoProvisioningSetting) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2017-08-01-preview/compliances/predicates.go b/resource-manager/security/2017-08-01-preview/compliances/predicates.go
index d439c0f9c1e..a0849ac334c 100644
--- a/resource-manager/security/2017-08-01-preview/compliances/predicates.go
+++ b/resource-manager/security/2017-08-01-preview/compliances/predicates.go
@@ -11,15 +11,15 @@ type ComplianceOperationPredicate struct {
 
 func (p ComplianceOperationPredicate) Matches(input Compliance) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2017-08-01-preview/devicesecuritygroups/predicates.go b/resource-manager/security/2017-08-01-preview/devicesecuritygroups/predicates.go
index e6650b4cd90..c4ff87efcaa 100644
--- a/resource-manager/security/2017-08-01-preview/devicesecuritygroups/predicates.go
+++ b/resource-manager/security/2017-08-01-preview/devicesecuritygroups/predicates.go
@@ -11,15 +11,15 @@ type DeviceSecurityGroupOperationPredicate struct {
 
 func (p DeviceSecurityGroupOperationPredicate) Matches(input DeviceSecurityGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2017-08-01-preview/informationprotectionpolicies/predicates.go b/resource-manager/security/2017-08-01-preview/informationprotectionpolicies/predicates.go
index 21f8fd49500..64bce19c168 100644
--- a/resource-manager/security/2017-08-01-preview/informationprotectionpolicies/predicates.go
+++ b/resource-manager/security/2017-08-01-preview/informationprotectionpolicies/predicates.go
@@ -11,15 +11,15 @@ type InformationProtectionPolicyOperationPredicate struct {
 
 func (p InformationProtectionPolicyOperationPredicate) Matches(input InformationProtectionPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2017-08-01-preview/iotsecuritysolutions/predicates.go b/resource-manager/security/2017-08-01-preview/iotsecuritysolutions/predicates.go
index 8b83dc71a34..5459e683fae 100644
--- a/resource-manager/security/2017-08-01-preview/iotsecuritysolutions/predicates.go
+++ b/resource-manager/security/2017-08-01-preview/iotsecuritysolutions/predicates.go
@@ -12,19 +12,19 @@ type IoTSecuritySolutionModelOperationPredicate struct {
 
 func (p IoTSecuritySolutionModelOperationPredicate) Matches(input IoTSecuritySolutionModel) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2017-08-01-preview/iotsecuritysolutionsanalytics/predicates.go b/resource-manager/security/2017-08-01-preview/iotsecuritysolutionsanalytics/predicates.go
index fadfb017dc2..223cc1ffdc4 100644
--- a/resource-manager/security/2017-08-01-preview/iotsecuritysolutionsanalytics/predicates.go
+++ b/resource-manager/security/2017-08-01-preview/iotsecuritysolutionsanalytics/predicates.go
@@ -11,15 +11,15 @@ type IoTSecurityAggregatedAlertOperationPredicate struct {
 
 func (p IoTSecurityAggregatedAlertOperationPredicate) Matches(input IoTSecurityAggregatedAlert) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type IoTSecurityAggregatedRecommendationOperationPredicate struct {
 
 func (p IoTSecurityAggregatedRecommendationOperationPredicate) Matches(input IoTSecurityAggregatedRecommendation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2017-08-01-preview/pricings/predicates.go b/resource-manager/security/2017-08-01-preview/pricings/predicates.go
index d7ab7701d54..b4ed4dbbc97 100644
--- a/resource-manager/security/2017-08-01-preview/pricings/predicates.go
+++ b/resource-manager/security/2017-08-01-preview/pricings/predicates.go
@@ -11,15 +11,15 @@ type PricingOperationPredicate struct {
 
 func (p PricingOperationPredicate) Matches(input Pricing) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2017-08-01-preview/securitycontacts/predicates.go b/resource-manager/security/2017-08-01-preview/securitycontacts/predicates.go
index 06540d0d6cb..c92d20bb42b 100644
--- a/resource-manager/security/2017-08-01-preview/securitycontacts/predicates.go
+++ b/resource-manager/security/2017-08-01-preview/securitycontacts/predicates.go
@@ -11,15 +11,15 @@ type SecurityContactOperationPredicate struct {
 
 func (p SecurityContactOperationPredicate) Matches(input SecurityContact) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2017-08-01-preview/workspacesettings/predicates.go b/resource-manager/security/2017-08-01-preview/workspacesettings/predicates.go
index 8d7f5b2ab2a..c11aa0bb7dc 100644
--- a/resource-manager/security/2017-08-01-preview/workspacesettings/predicates.go
+++ b/resource-manager/security/2017-08-01-preview/workspacesettings/predicates.go
@@ -11,15 +11,15 @@ type WorkspaceSettingOperationPredicate struct {
 
 func (p WorkspaceSettingOperationPredicate) Matches(input WorkspaceSetting) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2019-01-01-preview/alertssuppressionrules/predicates.go b/resource-manager/security/2019-01-01-preview/alertssuppressionrules/predicates.go
index 4bdeb6a85a0..cf1d358a98f 100644
--- a/resource-manager/security/2019-01-01-preview/alertssuppressionrules/predicates.go
+++ b/resource-manager/security/2019-01-01-preview/alertssuppressionrules/predicates.go
@@ -11,15 +11,15 @@ type AlertsSuppressionRuleOperationPredicate struct {
 
 func (p AlertsSuppressionRuleOperationPredicate) Matches(input AlertsSuppressionRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2019-01-01-preview/assessments/predicates.go b/resource-manager/security/2019-01-01-preview/assessments/predicates.go
index 11a95807cbc..194bfd7dd0b 100644
--- a/resource-manager/security/2019-01-01-preview/assessments/predicates.go
+++ b/resource-manager/security/2019-01-01-preview/assessments/predicates.go
@@ -11,15 +11,15 @@ type SecurityAssessmentOperationPredicate struct {
 
 func (p SecurityAssessmentOperationPredicate) Matches(input SecurityAssessment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2019-01-01-preview/assessmentsmetadata/predicates.go b/resource-manager/security/2019-01-01-preview/assessmentsmetadata/predicates.go
index 5dc5e52738e..1f924252a0a 100644
--- a/resource-manager/security/2019-01-01-preview/assessmentsmetadata/predicates.go
+++ b/resource-manager/security/2019-01-01-preview/assessmentsmetadata/predicates.go
@@ -11,15 +11,15 @@ type SecurityAssessmentMetadataOperationPredicate struct {
 
 func (p SecurityAssessmentMetadataOperationPredicate) Matches(input SecurityAssessmentMetadata) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2019-01-01-preview/automations/predicates.go b/resource-manager/security/2019-01-01-preview/automations/predicates.go
index 373e73c9083..a6cfd2c64e7 100644
--- a/resource-manager/security/2019-01-01-preview/automations/predicates.go
+++ b/resource-manager/security/2019-01-01-preview/automations/predicates.go
@@ -14,27 +14,27 @@ type AutomationOperationPredicate struct {
 
 func (p AutomationOperationPredicate) Matches(input Automation) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2019-01-01-preview/regulatorycompliance/predicates.go b/resource-manager/security/2019-01-01-preview/regulatorycompliance/predicates.go
index 632ce7f2d17..8b816f9470e 100644
--- a/resource-manager/security/2019-01-01-preview/regulatorycompliance/predicates.go
+++ b/resource-manager/security/2019-01-01-preview/regulatorycompliance/predicates.go
@@ -11,15 +11,15 @@ type RegulatoryComplianceAssessmentOperationPredicate struct {
 
 func (p RegulatoryComplianceAssessmentOperationPredicate) Matches(input RegulatoryComplianceAssessment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type RegulatoryComplianceControlOperationPredicate struct {
 
 func (p RegulatoryComplianceControlOperationPredicate) Matches(input RegulatoryComplianceControl) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -57,15 +57,15 @@ type RegulatoryComplianceStandardOperationPredicate struct {
 
 func (p RegulatoryComplianceStandardOperationPredicate) Matches(input RegulatoryComplianceStandard) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2019-01-01-preview/subassessments/predicates.go b/resource-manager/security/2019-01-01-preview/subassessments/predicates.go
index ce91eae946a..9615e2638d7 100644
--- a/resource-manager/security/2019-01-01-preview/subassessments/predicates.go
+++ b/resource-manager/security/2019-01-01-preview/subassessments/predicates.go
@@ -11,15 +11,15 @@ type SecuritySubAssessmentOperationPredicate struct {
 
 func (p SecuritySubAssessmentOperationPredicate) Matches(input SecuritySubAssessment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2019-01-01/alerts/predicates.go b/resource-manager/security/2019-01-01/alerts/predicates.go
index 7e860c845bb..8eae453a8b9 100644
--- a/resource-manager/security/2019-01-01/alerts/predicates.go
+++ b/resource-manager/security/2019-01-01/alerts/predicates.go
@@ -11,15 +11,15 @@ type AlertOperationPredicate struct {
 
 func (p AlertOperationPredicate) Matches(input Alert) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2020-01-01/adaptivenetworkhardenings/predicates.go b/resource-manager/security/2020-01-01/adaptivenetworkhardenings/predicates.go
index 56d50c0cf2f..9a98644506f 100644
--- a/resource-manager/security/2020-01-01/adaptivenetworkhardenings/predicates.go
+++ b/resource-manager/security/2020-01-01/adaptivenetworkhardenings/predicates.go
@@ -11,15 +11,15 @@ type AdaptiveNetworkHardeningOperationPredicate struct {
 
 func (p AdaptiveNetworkHardeningOperationPredicate) Matches(input AdaptiveNetworkHardening) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2020-01-01/alerts/predicates.go b/resource-manager/security/2020-01-01/alerts/predicates.go
index 7e860c845bb..8eae453a8b9 100644
--- a/resource-manager/security/2020-01-01/alerts/predicates.go
+++ b/resource-manager/security/2020-01-01/alerts/predicates.go
@@ -11,15 +11,15 @@ type AlertOperationPredicate struct {
 
 func (p AlertOperationPredicate) Matches(input Alert) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2020-01-01/allowedconnections/predicates.go b/resource-manager/security/2020-01-01/allowedconnections/predicates.go
index b3591bf676e..014aa7f926b 100644
--- a/resource-manager/security/2020-01-01/allowedconnections/predicates.go
+++ b/resource-manager/security/2020-01-01/allowedconnections/predicates.go
@@ -12,19 +12,19 @@ type AllowedConnectionsResourceOperationPredicate struct {
 
 func (p AllowedConnectionsResourceOperationPredicate) Matches(input AllowedConnectionsResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2020-01-01/assessments/predicates.go b/resource-manager/security/2020-01-01/assessments/predicates.go
index 11a95807cbc..194bfd7dd0b 100644
--- a/resource-manager/security/2020-01-01/assessments/predicates.go
+++ b/resource-manager/security/2020-01-01/assessments/predicates.go
@@ -11,15 +11,15 @@ type SecurityAssessmentOperationPredicate struct {
 
 func (p SecurityAssessmentOperationPredicate) Matches(input SecurityAssessment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2020-01-01/assessmentsmetadata/predicates.go b/resource-manager/security/2020-01-01/assessmentsmetadata/predicates.go
index 5dc5e52738e..1f924252a0a 100644
--- a/resource-manager/security/2020-01-01/assessmentsmetadata/predicates.go
+++ b/resource-manager/security/2020-01-01/assessmentsmetadata/predicates.go
@@ -11,15 +11,15 @@ type SecurityAssessmentMetadataOperationPredicate struct {
 
 func (p SecurityAssessmentMetadataOperationPredicate) Matches(input SecurityAssessmentMetadata) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2020-01-01/discoveredsecuritysolutions/predicates.go b/resource-manager/security/2020-01-01/discoveredsecuritysolutions/predicates.go
index 14974e1e091..544271ed94f 100644
--- a/resource-manager/security/2020-01-01/discoveredsecuritysolutions/predicates.go
+++ b/resource-manager/security/2020-01-01/discoveredsecuritysolutions/predicates.go
@@ -12,19 +12,19 @@ type DiscoveredSecuritySolutionOperationPredicate struct {
 
 func (p DiscoveredSecuritySolutionOperationPredicate) Matches(input DiscoveredSecuritySolution) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2020-01-01/jitnetworkaccesspolicies/predicates.go b/resource-manager/security/2020-01-01/jitnetworkaccesspolicies/predicates.go
index 68d98554837..6a4888bb63b 100644
--- a/resource-manager/security/2020-01-01/jitnetworkaccesspolicies/predicates.go
+++ b/resource-manager/security/2020-01-01/jitnetworkaccesspolicies/predicates.go
@@ -13,23 +13,23 @@ type JitNetworkAccessPolicyOperationPredicate struct {
 
 func (p JitNetworkAccessPolicyOperationPredicate) Matches(input JitNetworkAccessPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2020-01-01/securescore/predicates.go b/resource-manager/security/2020-01-01/securescore/predicates.go
index 812e8eec40f..16a1a9692c7 100644
--- a/resource-manager/security/2020-01-01/securescore/predicates.go
+++ b/resource-manager/security/2020-01-01/securescore/predicates.go
@@ -11,15 +11,15 @@ type SecureScoreControlDetailsOperationPredicate struct {
 
 func (p SecureScoreControlDetailsOperationPredicate) Matches(input SecureScoreControlDetails) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type SecureScoreItemOperationPredicate struct {
 
 func (p SecureScoreItemOperationPredicate) Matches(input SecureScoreItem) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2020-01-01/securescorecontroldefinitions/predicates.go b/resource-manager/security/2020-01-01/securescorecontroldefinitions/predicates.go
index d73539c87f5..10ebd9902e9 100644
--- a/resource-manager/security/2020-01-01/securescorecontroldefinitions/predicates.go
+++ b/resource-manager/security/2020-01-01/securescorecontroldefinitions/predicates.go
@@ -11,15 +11,15 @@ type SecureScoreControlDefinitionItemOperationPredicate struct {
 
 func (p SecureScoreControlDefinitionItemOperationPredicate) Matches(input SecureScoreControlDefinitionItem) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2020-01-01/securescorecontrols/predicates.go b/resource-manager/security/2020-01-01/securescorecontrols/predicates.go
index b834dacd897..6e4c0ee1c96 100644
--- a/resource-manager/security/2020-01-01/securescorecontrols/predicates.go
+++ b/resource-manager/security/2020-01-01/securescorecontrols/predicates.go
@@ -11,15 +11,15 @@ type SecureScoreControlDetailsOperationPredicate struct {
 
 func (p SecureScoreControlDetailsOperationPredicate) Matches(input SecureScoreControlDetails) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2020-01-01/securitysolutions/predicates.go b/resource-manager/security/2020-01-01/securitysolutions/predicates.go
index 7c09a5d3f59..0c6db224b32 100644
--- a/resource-manager/security/2020-01-01/securitysolutions/predicates.go
+++ b/resource-manager/security/2020-01-01/securitysolutions/predicates.go
@@ -12,19 +12,19 @@ type SecuritySolutionOperationPredicate struct {
 
 func (p SecuritySolutionOperationPredicate) Matches(input SecuritySolution) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2020-01-01/topology/predicates.go b/resource-manager/security/2020-01-01/topology/predicates.go
index 47bf83399f4..a03588db90a 100644
--- a/resource-manager/security/2020-01-01/topology/predicates.go
+++ b/resource-manager/security/2020-01-01/topology/predicates.go
@@ -12,19 +12,19 @@ type TopologyResourceOperationPredicate struct {
 
 func (p TopologyResourceOperationPredicate) Matches(input TopologyResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2021-06-01/assessments/predicates.go b/resource-manager/security/2021-06-01/assessments/predicates.go
index bfb911f36a9..18b3c8f0c18 100644
--- a/resource-manager/security/2021-06-01/assessments/predicates.go
+++ b/resource-manager/security/2021-06-01/assessments/predicates.go
@@ -11,15 +11,15 @@ type SecurityAssessmentResponseOperationPredicate struct {
 
 func (p SecurityAssessmentResponseOperationPredicate) Matches(input SecurityAssessmentResponse) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/security/2021-06-01/assessmentsmetadata/predicates.go b/resource-manager/security/2021-06-01/assessmentsmetadata/predicates.go
index 808883c7d7c..0ab05ff02cc 100644
--- a/resource-manager/security/2021-06-01/assessmentsmetadata/predicates.go
+++ b/resource-manager/security/2021-06-01/assessmentsmetadata/predicates.go
@@ -11,15 +11,15 @@ type SecurityAssessmentMetadataResponseOperationPredicate struct {
 
 func (p SecurityAssessmentMetadataResponseOperationPredicate) Matches(input SecurityAssessmentMetadataResponse) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2021-09-01-preview/actions/predicates.go b/resource-manager/securityinsights/2021-09-01-preview/actions/predicates.go
index 7f118769b8c..317d6feb3d6 100644
--- a/resource-manager/securityinsights/2021-09-01-preview/actions/predicates.go
+++ b/resource-manager/securityinsights/2021-09-01-preview/actions/predicates.go
@@ -12,19 +12,19 @@ type ActionResponseOperationPredicate struct {
 
 func (p ActionResponseOperationPredicate) Matches(input ActionResponse) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2021-09-01-preview/automationrules/predicates.go b/resource-manager/securityinsights/2021-09-01-preview/automationrules/predicates.go
index 977bc573b29..eaa1f88eb83 100644
--- a/resource-manager/securityinsights/2021-09-01-preview/automationrules/predicates.go
+++ b/resource-manager/securityinsights/2021-09-01-preview/automationrules/predicates.go
@@ -12,19 +12,19 @@ type AutomationRuleOperationPredicate struct {
 
 func (p AutomationRuleOperationPredicate) Matches(input AutomationRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2021-09-01-preview/bookmarkrelations/predicates.go b/resource-manager/securityinsights/2021-09-01-preview/bookmarkrelations/predicates.go
index 7bae9d0974b..575631e64a9 100644
--- a/resource-manager/securityinsights/2021-09-01-preview/bookmarkrelations/predicates.go
+++ b/resource-manager/securityinsights/2021-09-01-preview/bookmarkrelations/predicates.go
@@ -12,19 +12,19 @@ type RelationOperationPredicate struct {
 
 func (p RelationOperationPredicate) Matches(input Relation) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2021-09-01-preview/bookmarks/predicates.go b/resource-manager/securityinsights/2021-09-01-preview/bookmarks/predicates.go
index 270abcd755c..d5334a9af01 100644
--- a/resource-manager/securityinsights/2021-09-01-preview/bookmarks/predicates.go
+++ b/resource-manager/securityinsights/2021-09-01-preview/bookmarks/predicates.go
@@ -12,19 +12,19 @@ type BookmarkOperationPredicate struct {
 
 func (p BookmarkOperationPredicate) Matches(input Bookmark) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2021-09-01-preview/entities/predicates.go b/resource-manager/securityinsights/2021-09-01-preview/entities/predicates.go
index 595e2fb0311..f0f983c5e68 100644
--- a/resource-manager/securityinsights/2021-09-01-preview/entities/predicates.go
+++ b/resource-manager/securityinsights/2021-09-01-preview/entities/predicates.go
@@ -11,15 +11,15 @@ type EntityOperationPredicate struct {
 
 func (p EntityOperationPredicate) Matches(input Entity) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2021-09-01-preview/entityrelations/predicates.go b/resource-manager/securityinsights/2021-09-01-preview/entityrelations/predicates.go
index 0401ec47b91..28d0d19df17 100644
--- a/resource-manager/securityinsights/2021-09-01-preview/entityrelations/predicates.go
+++ b/resource-manager/securityinsights/2021-09-01-preview/entityrelations/predicates.go
@@ -12,19 +12,19 @@ type RelationOperationPredicate struct {
 
 func (p RelationOperationPredicate) Matches(input Relation) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2021-09-01-preview/incidentcomments/predicates.go b/resource-manager/securityinsights/2021-09-01-preview/incidentcomments/predicates.go
index b94345222ff..434091dbb53 100644
--- a/resource-manager/securityinsights/2021-09-01-preview/incidentcomments/predicates.go
+++ b/resource-manager/securityinsights/2021-09-01-preview/incidentcomments/predicates.go
@@ -12,19 +12,19 @@ type IncidentCommentOperationPredicate struct {
 
 func (p IncidentCommentOperationPredicate) Matches(input IncidentComment) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2021-09-01-preview/incidentrelations/predicates.go b/resource-manager/securityinsights/2021-09-01-preview/incidentrelations/predicates.go
index 778dbc9d22b..35c3a9c1e3a 100644
--- a/resource-manager/securityinsights/2021-09-01-preview/incidentrelations/predicates.go
+++ b/resource-manager/securityinsights/2021-09-01-preview/incidentrelations/predicates.go
@@ -12,19 +12,19 @@ type RelationOperationPredicate struct {
 
 func (p RelationOperationPredicate) Matches(input Relation) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2021-09-01-preview/incidents/predicates.go b/resource-manager/securityinsights/2021-09-01-preview/incidents/predicates.go
index dbfebabdfef..6d4cc3da0be 100644
--- a/resource-manager/securityinsights/2021-09-01-preview/incidents/predicates.go
+++ b/resource-manager/securityinsights/2021-09-01-preview/incidents/predicates.go
@@ -12,19 +12,19 @@ type IncidentOperationPredicate struct {
 
 func (p IncidentOperationPredicate) Matches(input Incident) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2021-09-01-preview/metadata/predicates.go b/resource-manager/securityinsights/2021-09-01-preview/metadata/predicates.go
index fceef75135a..11492b7da36 100644
--- a/resource-manager/securityinsights/2021-09-01-preview/metadata/predicates.go
+++ b/resource-manager/securityinsights/2021-09-01-preview/metadata/predicates.go
@@ -12,19 +12,19 @@ type MetadataModelOperationPredicate struct {
 
 func (p MetadataModelOperationPredicate) Matches(input MetadataModel) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2021-09-01-preview/officeconsents/predicates.go b/resource-manager/securityinsights/2021-09-01-preview/officeconsents/predicates.go
index 8d615da8440..de2081d698d 100644
--- a/resource-manager/securityinsights/2021-09-01-preview/officeconsents/predicates.go
+++ b/resource-manager/securityinsights/2021-09-01-preview/officeconsents/predicates.go
@@ -11,15 +11,15 @@ type OfficeConsentOperationPredicate struct {
 
 func (p OfficeConsentOperationPredicate) Matches(input OfficeConsent) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2021-09-01-preview/repositories/predicates.go b/resource-manager/securityinsights/2021-09-01-preview/repositories/predicates.go
index d7300c84718..948d5824d0f 100644
--- a/resource-manager/securityinsights/2021-09-01-preview/repositories/predicates.go
+++ b/resource-manager/securityinsights/2021-09-01-preview/repositories/predicates.go
@@ -10,11 +10,11 @@ type RepoOperationPredicate struct {
 
 func (p RepoOperationPredicate) Matches(input Repo) bool {
 
-	if p.FullName != nil && (input.FullName == nil && *p.FullName != *input.FullName) {
+	if p.FullName != nil && (input.FullName == nil || *p.FullName != *input.FullName) {
 		return false
 	}
 
-	if p.Url != nil && (input.Url == nil && *p.Url != *input.Url) {
+	if p.Url != nil && (input.Url == nil || *p.Url != *input.Url) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2021-09-01-preview/sourcecontrols/predicates.go b/resource-manager/securityinsights/2021-09-01-preview/sourcecontrols/predicates.go
index 4245c0e5c50..6f0751146d1 100644
--- a/resource-manager/securityinsights/2021-09-01-preview/sourcecontrols/predicates.go
+++ b/resource-manager/securityinsights/2021-09-01-preview/sourcecontrols/predicates.go
@@ -12,19 +12,19 @@ type SourceControlOperationPredicate struct {
 
 func (p SourceControlOperationPredicate) Matches(input SourceControl) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2021-09-01-preview/watchlistitems/predicates.go b/resource-manager/securityinsights/2021-09-01-preview/watchlistitems/predicates.go
index d595873ebcf..c9960b515cb 100644
--- a/resource-manager/securityinsights/2021-09-01-preview/watchlistitems/predicates.go
+++ b/resource-manager/securityinsights/2021-09-01-preview/watchlistitems/predicates.go
@@ -12,19 +12,19 @@ type WatchlistItemOperationPredicate struct {
 
 func (p WatchlistItemOperationPredicate) Matches(input WatchlistItem) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2021-09-01-preview/watchlists/predicates.go b/resource-manager/securityinsights/2021-09-01-preview/watchlists/predicates.go
index 1b743bb52b6..f335c7c61ff 100644
--- a/resource-manager/securityinsights/2021-09-01-preview/watchlists/predicates.go
+++ b/resource-manager/securityinsights/2021-09-01-preview/watchlists/predicates.go
@@ -12,19 +12,19 @@ type WatchlistOperationPredicate struct {
 
 func (p WatchlistOperationPredicate) Matches(input Watchlist) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-07-01-preview/actions/predicates.go b/resource-manager/securityinsights/2022-07-01-preview/actions/predicates.go
index 7f118769b8c..317d6feb3d6 100644
--- a/resource-manager/securityinsights/2022-07-01-preview/actions/predicates.go
+++ b/resource-manager/securityinsights/2022-07-01-preview/actions/predicates.go
@@ -12,19 +12,19 @@ type ActionResponseOperationPredicate struct {
 
 func (p ActionResponseOperationPredicate) Matches(input ActionResponse) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-07-01-preview/automationrules/predicates.go b/resource-manager/securityinsights/2022-07-01-preview/automationrules/predicates.go
index 977bc573b29..eaa1f88eb83 100644
--- a/resource-manager/securityinsights/2022-07-01-preview/automationrules/predicates.go
+++ b/resource-manager/securityinsights/2022-07-01-preview/automationrules/predicates.go
@@ -12,19 +12,19 @@ type AutomationRuleOperationPredicate struct {
 
 func (p AutomationRuleOperationPredicate) Matches(input AutomationRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-07-01-preview/bookmarkrelations/predicates.go b/resource-manager/securityinsights/2022-07-01-preview/bookmarkrelations/predicates.go
index 7bae9d0974b..575631e64a9 100644
--- a/resource-manager/securityinsights/2022-07-01-preview/bookmarkrelations/predicates.go
+++ b/resource-manager/securityinsights/2022-07-01-preview/bookmarkrelations/predicates.go
@@ -12,19 +12,19 @@ type RelationOperationPredicate struct {
 
 func (p RelationOperationPredicate) Matches(input Relation) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-07-01-preview/bookmarks/predicates.go b/resource-manager/securityinsights/2022-07-01-preview/bookmarks/predicates.go
index 270abcd755c..d5334a9af01 100644
--- a/resource-manager/securityinsights/2022-07-01-preview/bookmarks/predicates.go
+++ b/resource-manager/securityinsights/2022-07-01-preview/bookmarks/predicates.go
@@ -12,19 +12,19 @@ type BookmarkOperationPredicate struct {
 
 func (p BookmarkOperationPredicate) Matches(input Bookmark) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-07-01-preview/entities/predicates.go b/resource-manager/securityinsights/2022-07-01-preview/entities/predicates.go
index 595e2fb0311..f0f983c5e68 100644
--- a/resource-manager/securityinsights/2022-07-01-preview/entities/predicates.go
+++ b/resource-manager/securityinsights/2022-07-01-preview/entities/predicates.go
@@ -11,15 +11,15 @@ type EntityOperationPredicate struct {
 
 func (p EntityOperationPredicate) Matches(input Entity) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-07-01-preview/entityrelations/predicates.go b/resource-manager/securityinsights/2022-07-01-preview/entityrelations/predicates.go
index 0401ec47b91..28d0d19df17 100644
--- a/resource-manager/securityinsights/2022-07-01-preview/entityrelations/predicates.go
+++ b/resource-manager/securityinsights/2022-07-01-preview/entityrelations/predicates.go
@@ -12,19 +12,19 @@ type RelationOperationPredicate struct {
 
 func (p RelationOperationPredicate) Matches(input Relation) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-07-01-preview/incidentcomments/predicates.go b/resource-manager/securityinsights/2022-07-01-preview/incidentcomments/predicates.go
index b94345222ff..434091dbb53 100644
--- a/resource-manager/securityinsights/2022-07-01-preview/incidentcomments/predicates.go
+++ b/resource-manager/securityinsights/2022-07-01-preview/incidentcomments/predicates.go
@@ -12,19 +12,19 @@ type IncidentCommentOperationPredicate struct {
 
 func (p IncidentCommentOperationPredicate) Matches(input IncidentComment) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-07-01-preview/incidentrelations/predicates.go b/resource-manager/securityinsights/2022-07-01-preview/incidentrelations/predicates.go
index 778dbc9d22b..35c3a9c1e3a 100644
--- a/resource-manager/securityinsights/2022-07-01-preview/incidentrelations/predicates.go
+++ b/resource-manager/securityinsights/2022-07-01-preview/incidentrelations/predicates.go
@@ -12,19 +12,19 @@ type RelationOperationPredicate struct {
 
 func (p RelationOperationPredicate) Matches(input Relation) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-07-01-preview/incidents/predicates.go b/resource-manager/securityinsights/2022-07-01-preview/incidents/predicates.go
index dbfebabdfef..6d4cc3da0be 100644
--- a/resource-manager/securityinsights/2022-07-01-preview/incidents/predicates.go
+++ b/resource-manager/securityinsights/2022-07-01-preview/incidents/predicates.go
@@ -12,19 +12,19 @@ type IncidentOperationPredicate struct {
 
 func (p IncidentOperationPredicate) Matches(input Incident) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-07-01-preview/metadata/predicates.go b/resource-manager/securityinsights/2022-07-01-preview/metadata/predicates.go
index fceef75135a..11492b7da36 100644
--- a/resource-manager/securityinsights/2022-07-01-preview/metadata/predicates.go
+++ b/resource-manager/securityinsights/2022-07-01-preview/metadata/predicates.go
@@ -12,19 +12,19 @@ type MetadataModelOperationPredicate struct {
 
 func (p MetadataModelOperationPredicate) Matches(input MetadataModel) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-07-01-preview/officeconsents/predicates.go b/resource-manager/securityinsights/2022-07-01-preview/officeconsents/predicates.go
index 8d615da8440..de2081d698d 100644
--- a/resource-manager/securityinsights/2022-07-01-preview/officeconsents/predicates.go
+++ b/resource-manager/securityinsights/2022-07-01-preview/officeconsents/predicates.go
@@ -11,15 +11,15 @@ type OfficeConsentOperationPredicate struct {
 
 func (p OfficeConsentOperationPredicate) Matches(input OfficeConsent) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-07-01-preview/repositories/predicates.go b/resource-manager/securityinsights/2022-07-01-preview/repositories/predicates.go
index d7300c84718..948d5824d0f 100644
--- a/resource-manager/securityinsights/2022-07-01-preview/repositories/predicates.go
+++ b/resource-manager/securityinsights/2022-07-01-preview/repositories/predicates.go
@@ -10,11 +10,11 @@ type RepoOperationPredicate struct {
 
 func (p RepoOperationPredicate) Matches(input Repo) bool {
 
-	if p.FullName != nil && (input.FullName == nil && *p.FullName != *input.FullName) {
+	if p.FullName != nil && (input.FullName == nil || *p.FullName != *input.FullName) {
 		return false
 	}
 
-	if p.Url != nil && (input.Url == nil && *p.Url != *input.Url) {
+	if p.Url != nil && (input.Url == nil || *p.Url != *input.Url) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-07-01-preview/sourcecontrols/predicates.go b/resource-manager/securityinsights/2022-07-01-preview/sourcecontrols/predicates.go
index 4245c0e5c50..6f0751146d1 100644
--- a/resource-manager/securityinsights/2022-07-01-preview/sourcecontrols/predicates.go
+++ b/resource-manager/securityinsights/2022-07-01-preview/sourcecontrols/predicates.go
@@ -12,19 +12,19 @@ type SourceControlOperationPredicate struct {
 
 func (p SourceControlOperationPredicate) Matches(input SourceControl) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-07-01-preview/watchlistitems/predicates.go b/resource-manager/securityinsights/2022-07-01-preview/watchlistitems/predicates.go
index d595873ebcf..c9960b515cb 100644
--- a/resource-manager/securityinsights/2022-07-01-preview/watchlistitems/predicates.go
+++ b/resource-manager/securityinsights/2022-07-01-preview/watchlistitems/predicates.go
@@ -12,19 +12,19 @@ type WatchlistItemOperationPredicate struct {
 
 func (p WatchlistItemOperationPredicate) Matches(input WatchlistItem) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-07-01-preview/watchlists/predicates.go b/resource-manager/securityinsights/2022-07-01-preview/watchlists/predicates.go
index 1b743bb52b6..f335c7c61ff 100644
--- a/resource-manager/securityinsights/2022-07-01-preview/watchlists/predicates.go
+++ b/resource-manager/securityinsights/2022-07-01-preview/watchlists/predicates.go
@@ -12,19 +12,19 @@ type WatchlistOperationPredicate struct {
 
 func (p WatchlistOperationPredicate) Matches(input Watchlist) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-08-01/actions/predicates.go b/resource-manager/securityinsights/2022-08-01/actions/predicates.go
index 7f118769b8c..317d6feb3d6 100644
--- a/resource-manager/securityinsights/2022-08-01/actions/predicates.go
+++ b/resource-manager/securityinsights/2022-08-01/actions/predicates.go
@@ -12,19 +12,19 @@ type ActionResponseOperationPredicate struct {
 
 func (p ActionResponseOperationPredicate) Matches(input ActionResponse) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-08-01/automationrules/predicates.go b/resource-manager/securityinsights/2022-08-01/automationrules/predicates.go
index 977bc573b29..eaa1f88eb83 100644
--- a/resource-manager/securityinsights/2022-08-01/automationrules/predicates.go
+++ b/resource-manager/securityinsights/2022-08-01/automationrules/predicates.go
@@ -12,19 +12,19 @@ type AutomationRuleOperationPredicate struct {
 
 func (p AutomationRuleOperationPredicate) Matches(input AutomationRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-08-01/bookmarks/predicates.go b/resource-manager/securityinsights/2022-08-01/bookmarks/predicates.go
index 270abcd755c..d5334a9af01 100644
--- a/resource-manager/securityinsights/2022-08-01/bookmarks/predicates.go
+++ b/resource-manager/securityinsights/2022-08-01/bookmarks/predicates.go
@@ -12,19 +12,19 @@ type BookmarkOperationPredicate struct {
 
 func (p BookmarkOperationPredicate) Matches(input Bookmark) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-08-01/incidentcomments/predicates.go b/resource-manager/securityinsights/2022-08-01/incidentcomments/predicates.go
index b94345222ff..434091dbb53 100644
--- a/resource-manager/securityinsights/2022-08-01/incidentcomments/predicates.go
+++ b/resource-manager/securityinsights/2022-08-01/incidentcomments/predicates.go
@@ -12,19 +12,19 @@ type IncidentCommentOperationPredicate struct {
 
 func (p IncidentCommentOperationPredicate) Matches(input IncidentComment) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-08-01/incidentrelations/predicates.go b/resource-manager/securityinsights/2022-08-01/incidentrelations/predicates.go
index 778dbc9d22b..35c3a9c1e3a 100644
--- a/resource-manager/securityinsights/2022-08-01/incidentrelations/predicates.go
+++ b/resource-manager/securityinsights/2022-08-01/incidentrelations/predicates.go
@@ -12,19 +12,19 @@ type RelationOperationPredicate struct {
 
 func (p RelationOperationPredicate) Matches(input Relation) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-08-01/incidents/predicates.go b/resource-manager/securityinsights/2022-08-01/incidents/predicates.go
index dbfebabdfef..6d4cc3da0be 100644
--- a/resource-manager/securityinsights/2022-08-01/incidents/predicates.go
+++ b/resource-manager/securityinsights/2022-08-01/incidents/predicates.go
@@ -12,19 +12,19 @@ type IncidentOperationPredicate struct {
 
 func (p IncidentOperationPredicate) Matches(input Incident) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-08-01/watchlistitems/predicates.go b/resource-manager/securityinsights/2022-08-01/watchlistitems/predicates.go
index d595873ebcf..c9960b515cb 100644
--- a/resource-manager/securityinsights/2022-08-01/watchlistitems/predicates.go
+++ b/resource-manager/securityinsights/2022-08-01/watchlistitems/predicates.go
@@ -12,19 +12,19 @@ type WatchlistItemOperationPredicate struct {
 
 func (p WatchlistItemOperationPredicate) Matches(input WatchlistItem) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-08-01/watchlists/predicates.go b/resource-manager/securityinsights/2022-08-01/watchlists/predicates.go
index 1b743bb52b6..f335c7c61ff 100644
--- a/resource-manager/securityinsights/2022-08-01/watchlists/predicates.go
+++ b/resource-manager/securityinsights/2022-08-01/watchlists/predicates.go
@@ -12,19 +12,19 @@ type WatchlistOperationPredicate struct {
 
 func (p WatchlistOperationPredicate) Matches(input Watchlist) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-10-01-preview/actions/predicates.go b/resource-manager/securityinsights/2022-10-01-preview/actions/predicates.go
index 7f118769b8c..317d6feb3d6 100644
--- a/resource-manager/securityinsights/2022-10-01-preview/actions/predicates.go
+++ b/resource-manager/securityinsights/2022-10-01-preview/actions/predicates.go
@@ -12,19 +12,19 @@ type ActionResponseOperationPredicate struct {
 
 func (p ActionResponseOperationPredicate) Matches(input ActionResponse) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-10-01-preview/automationrules/predicates.go b/resource-manager/securityinsights/2022-10-01-preview/automationrules/predicates.go
index 977bc573b29..eaa1f88eb83 100644
--- a/resource-manager/securityinsights/2022-10-01-preview/automationrules/predicates.go
+++ b/resource-manager/securityinsights/2022-10-01-preview/automationrules/predicates.go
@@ -12,19 +12,19 @@ type AutomationRuleOperationPredicate struct {
 
 func (p AutomationRuleOperationPredicate) Matches(input AutomationRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-10-01-preview/bookmarkrelations/predicates.go b/resource-manager/securityinsights/2022-10-01-preview/bookmarkrelations/predicates.go
index 7bae9d0974b..575631e64a9 100644
--- a/resource-manager/securityinsights/2022-10-01-preview/bookmarkrelations/predicates.go
+++ b/resource-manager/securityinsights/2022-10-01-preview/bookmarkrelations/predicates.go
@@ -12,19 +12,19 @@ type RelationOperationPredicate struct {
 
 func (p RelationOperationPredicate) Matches(input Relation) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-10-01-preview/bookmarks/predicates.go b/resource-manager/securityinsights/2022-10-01-preview/bookmarks/predicates.go
index 270abcd755c..d5334a9af01 100644
--- a/resource-manager/securityinsights/2022-10-01-preview/bookmarks/predicates.go
+++ b/resource-manager/securityinsights/2022-10-01-preview/bookmarks/predicates.go
@@ -12,19 +12,19 @@ type BookmarkOperationPredicate struct {
 
 func (p BookmarkOperationPredicate) Matches(input Bookmark) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-10-01-preview/entities/predicates.go b/resource-manager/securityinsights/2022-10-01-preview/entities/predicates.go
index 595e2fb0311..f0f983c5e68 100644
--- a/resource-manager/securityinsights/2022-10-01-preview/entities/predicates.go
+++ b/resource-manager/securityinsights/2022-10-01-preview/entities/predicates.go
@@ -11,15 +11,15 @@ type EntityOperationPredicate struct {
 
 func (p EntityOperationPredicate) Matches(input Entity) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-10-01-preview/entityrelations/predicates.go b/resource-manager/securityinsights/2022-10-01-preview/entityrelations/predicates.go
index 0401ec47b91..28d0d19df17 100644
--- a/resource-manager/securityinsights/2022-10-01-preview/entityrelations/predicates.go
+++ b/resource-manager/securityinsights/2022-10-01-preview/entityrelations/predicates.go
@@ -12,19 +12,19 @@ type RelationOperationPredicate struct {
 
 func (p RelationOperationPredicate) Matches(input Relation) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-10-01-preview/fileimports/predicates.go b/resource-manager/securityinsights/2022-10-01-preview/fileimports/predicates.go
index 09b65df1886..3f8d6a366d0 100644
--- a/resource-manager/securityinsights/2022-10-01-preview/fileimports/predicates.go
+++ b/resource-manager/securityinsights/2022-10-01-preview/fileimports/predicates.go
@@ -11,15 +11,15 @@ type FileImportOperationPredicate struct {
 
 func (p FileImportOperationPredicate) Matches(input FileImport) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-10-01-preview/incidentcomments/predicates.go b/resource-manager/securityinsights/2022-10-01-preview/incidentcomments/predicates.go
index b94345222ff..434091dbb53 100644
--- a/resource-manager/securityinsights/2022-10-01-preview/incidentcomments/predicates.go
+++ b/resource-manager/securityinsights/2022-10-01-preview/incidentcomments/predicates.go
@@ -12,19 +12,19 @@ type IncidentCommentOperationPredicate struct {
 
 func (p IncidentCommentOperationPredicate) Matches(input IncidentComment) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-10-01-preview/incidentrelations/predicates.go b/resource-manager/securityinsights/2022-10-01-preview/incidentrelations/predicates.go
index 778dbc9d22b..35c3a9c1e3a 100644
--- a/resource-manager/securityinsights/2022-10-01-preview/incidentrelations/predicates.go
+++ b/resource-manager/securityinsights/2022-10-01-preview/incidentrelations/predicates.go
@@ -12,19 +12,19 @@ type RelationOperationPredicate struct {
 
 func (p RelationOperationPredicate) Matches(input Relation) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-10-01-preview/incidents/predicates.go b/resource-manager/securityinsights/2022-10-01-preview/incidents/predicates.go
index dbfebabdfef..6d4cc3da0be 100644
--- a/resource-manager/securityinsights/2022-10-01-preview/incidents/predicates.go
+++ b/resource-manager/securityinsights/2022-10-01-preview/incidents/predicates.go
@@ -12,19 +12,19 @@ type IncidentOperationPredicate struct {
 
 func (p IncidentOperationPredicate) Matches(input Incident) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-10-01-preview/metadata/predicates.go b/resource-manager/securityinsights/2022-10-01-preview/metadata/predicates.go
index fceef75135a..11492b7da36 100644
--- a/resource-manager/securityinsights/2022-10-01-preview/metadata/predicates.go
+++ b/resource-manager/securityinsights/2022-10-01-preview/metadata/predicates.go
@@ -12,19 +12,19 @@ type MetadataModelOperationPredicate struct {
 
 func (p MetadataModelOperationPredicate) Matches(input MetadataModel) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-10-01-preview/officeconsents/predicates.go b/resource-manager/securityinsights/2022-10-01-preview/officeconsents/predicates.go
index 8d615da8440..de2081d698d 100644
--- a/resource-manager/securityinsights/2022-10-01-preview/officeconsents/predicates.go
+++ b/resource-manager/securityinsights/2022-10-01-preview/officeconsents/predicates.go
@@ -11,15 +11,15 @@ type OfficeConsentOperationPredicate struct {
 
 func (p OfficeConsentOperationPredicate) Matches(input OfficeConsent) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-10-01-preview/repositories/predicates.go b/resource-manager/securityinsights/2022-10-01-preview/repositories/predicates.go
index d7300c84718..948d5824d0f 100644
--- a/resource-manager/securityinsights/2022-10-01-preview/repositories/predicates.go
+++ b/resource-manager/securityinsights/2022-10-01-preview/repositories/predicates.go
@@ -10,11 +10,11 @@ type RepoOperationPredicate struct {
 
 func (p RepoOperationPredicate) Matches(input Repo) bool {
 
-	if p.FullName != nil && (input.FullName == nil && *p.FullName != *input.FullName) {
+	if p.FullName != nil && (input.FullName == nil || *p.FullName != *input.FullName) {
 		return false
 	}
 
-	if p.Url != nil && (input.Url == nil && *p.Url != *input.Url) {
+	if p.Url != nil && (input.Url == nil || *p.Url != *input.Url) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-10-01-preview/sourcecontrols/predicates.go b/resource-manager/securityinsights/2022-10-01-preview/sourcecontrols/predicates.go
index 4245c0e5c50..6f0751146d1 100644
--- a/resource-manager/securityinsights/2022-10-01-preview/sourcecontrols/predicates.go
+++ b/resource-manager/securityinsights/2022-10-01-preview/sourcecontrols/predicates.go
@@ -12,19 +12,19 @@ type SourceControlOperationPredicate struct {
 
 func (p SourceControlOperationPredicate) Matches(input SourceControl) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-10-01-preview/watchlistitems/predicates.go b/resource-manager/securityinsights/2022-10-01-preview/watchlistitems/predicates.go
index d595873ebcf..c9960b515cb 100644
--- a/resource-manager/securityinsights/2022-10-01-preview/watchlistitems/predicates.go
+++ b/resource-manager/securityinsights/2022-10-01-preview/watchlistitems/predicates.go
@@ -12,19 +12,19 @@ type WatchlistItemOperationPredicate struct {
 
 func (p WatchlistItemOperationPredicate) Matches(input WatchlistItem) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-10-01-preview/watchlists/predicates.go b/resource-manager/securityinsights/2022-10-01-preview/watchlists/predicates.go
index 1b743bb52b6..f335c7c61ff 100644
--- a/resource-manager/securityinsights/2022-10-01-preview/watchlists/predicates.go
+++ b/resource-manager/securityinsights/2022-10-01-preview/watchlists/predicates.go
@@ -12,19 +12,19 @@ type WatchlistOperationPredicate struct {
 
 func (p WatchlistOperationPredicate) Matches(input Watchlist) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-11-01/actions/predicates.go b/resource-manager/securityinsights/2022-11-01/actions/predicates.go
index 7f118769b8c..317d6feb3d6 100644
--- a/resource-manager/securityinsights/2022-11-01/actions/predicates.go
+++ b/resource-manager/securityinsights/2022-11-01/actions/predicates.go
@@ -12,19 +12,19 @@ type ActionResponseOperationPredicate struct {
 
 func (p ActionResponseOperationPredicate) Matches(input ActionResponse) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-11-01/automationrules/predicates.go b/resource-manager/securityinsights/2022-11-01/automationrules/predicates.go
index 977bc573b29..eaa1f88eb83 100644
--- a/resource-manager/securityinsights/2022-11-01/automationrules/predicates.go
+++ b/resource-manager/securityinsights/2022-11-01/automationrules/predicates.go
@@ -12,19 +12,19 @@ type AutomationRuleOperationPredicate struct {
 
 func (p AutomationRuleOperationPredicate) Matches(input AutomationRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-11-01/bookmarks/predicates.go b/resource-manager/securityinsights/2022-11-01/bookmarks/predicates.go
index 270abcd755c..d5334a9af01 100644
--- a/resource-manager/securityinsights/2022-11-01/bookmarks/predicates.go
+++ b/resource-manager/securityinsights/2022-11-01/bookmarks/predicates.go
@@ -12,19 +12,19 @@ type BookmarkOperationPredicate struct {
 
 func (p BookmarkOperationPredicate) Matches(input Bookmark) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-11-01/incidentcomments/predicates.go b/resource-manager/securityinsights/2022-11-01/incidentcomments/predicates.go
index b94345222ff..434091dbb53 100644
--- a/resource-manager/securityinsights/2022-11-01/incidentcomments/predicates.go
+++ b/resource-manager/securityinsights/2022-11-01/incidentcomments/predicates.go
@@ -12,19 +12,19 @@ type IncidentCommentOperationPredicate struct {
 
 func (p IncidentCommentOperationPredicate) Matches(input IncidentComment) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-11-01/incidentrelations/predicates.go b/resource-manager/securityinsights/2022-11-01/incidentrelations/predicates.go
index 778dbc9d22b..35c3a9c1e3a 100644
--- a/resource-manager/securityinsights/2022-11-01/incidentrelations/predicates.go
+++ b/resource-manager/securityinsights/2022-11-01/incidentrelations/predicates.go
@@ -12,19 +12,19 @@ type RelationOperationPredicate struct {
 
 func (p RelationOperationPredicate) Matches(input Relation) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-11-01/incidents/predicates.go b/resource-manager/securityinsights/2022-11-01/incidents/predicates.go
index dbfebabdfef..6d4cc3da0be 100644
--- a/resource-manager/securityinsights/2022-11-01/incidents/predicates.go
+++ b/resource-manager/securityinsights/2022-11-01/incidents/predicates.go
@@ -12,19 +12,19 @@ type IncidentOperationPredicate struct {
 
 func (p IncidentOperationPredicate) Matches(input Incident) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-11-01/watchlistitems/predicates.go b/resource-manager/securityinsights/2022-11-01/watchlistitems/predicates.go
index d595873ebcf..c9960b515cb 100644
--- a/resource-manager/securityinsights/2022-11-01/watchlistitems/predicates.go
+++ b/resource-manager/securityinsights/2022-11-01/watchlistitems/predicates.go
@@ -12,19 +12,19 @@ type WatchlistItemOperationPredicate struct {
 
 func (p WatchlistItemOperationPredicate) Matches(input WatchlistItem) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2022-11-01/watchlists/predicates.go b/resource-manager/securityinsights/2022-11-01/watchlists/predicates.go
index 1b743bb52b6..f335c7c61ff 100644
--- a/resource-manager/securityinsights/2022-11-01/watchlists/predicates.go
+++ b/resource-manager/securityinsights/2022-11-01/watchlists/predicates.go
@@ -12,19 +12,19 @@ type WatchlistOperationPredicate struct {
 
 func (p WatchlistOperationPredicate) Matches(input Watchlist) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2023-02-01/actions/predicates.go b/resource-manager/securityinsights/2023-02-01/actions/predicates.go
index 7f118769b8c..317d6feb3d6 100644
--- a/resource-manager/securityinsights/2023-02-01/actions/predicates.go
+++ b/resource-manager/securityinsights/2023-02-01/actions/predicates.go
@@ -12,19 +12,19 @@ type ActionResponseOperationPredicate struct {
 
 func (p ActionResponseOperationPredicate) Matches(input ActionResponse) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2023-02-01/automationrules/predicates.go b/resource-manager/securityinsights/2023-02-01/automationrules/predicates.go
index 977bc573b29..eaa1f88eb83 100644
--- a/resource-manager/securityinsights/2023-02-01/automationrules/predicates.go
+++ b/resource-manager/securityinsights/2023-02-01/automationrules/predicates.go
@@ -12,19 +12,19 @@ type AutomationRuleOperationPredicate struct {
 
 func (p AutomationRuleOperationPredicate) Matches(input AutomationRule) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2023-02-01/bookmarks/predicates.go b/resource-manager/securityinsights/2023-02-01/bookmarks/predicates.go
index 270abcd755c..d5334a9af01 100644
--- a/resource-manager/securityinsights/2023-02-01/bookmarks/predicates.go
+++ b/resource-manager/securityinsights/2023-02-01/bookmarks/predicates.go
@@ -12,19 +12,19 @@ type BookmarkOperationPredicate struct {
 
 func (p BookmarkOperationPredicate) Matches(input Bookmark) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2023-02-01/incidentcomments/predicates.go b/resource-manager/securityinsights/2023-02-01/incidentcomments/predicates.go
index b94345222ff..434091dbb53 100644
--- a/resource-manager/securityinsights/2023-02-01/incidentcomments/predicates.go
+++ b/resource-manager/securityinsights/2023-02-01/incidentcomments/predicates.go
@@ -12,19 +12,19 @@ type IncidentCommentOperationPredicate struct {
 
 func (p IncidentCommentOperationPredicate) Matches(input IncidentComment) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2023-02-01/incidentrelations/predicates.go b/resource-manager/securityinsights/2023-02-01/incidentrelations/predicates.go
index 778dbc9d22b..35c3a9c1e3a 100644
--- a/resource-manager/securityinsights/2023-02-01/incidentrelations/predicates.go
+++ b/resource-manager/securityinsights/2023-02-01/incidentrelations/predicates.go
@@ -12,19 +12,19 @@ type RelationOperationPredicate struct {
 
 func (p RelationOperationPredicate) Matches(input Relation) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2023-02-01/incidents/predicates.go b/resource-manager/securityinsights/2023-02-01/incidents/predicates.go
index dbfebabdfef..6d4cc3da0be 100644
--- a/resource-manager/securityinsights/2023-02-01/incidents/predicates.go
+++ b/resource-manager/securityinsights/2023-02-01/incidents/predicates.go
@@ -12,19 +12,19 @@ type IncidentOperationPredicate struct {
 
 func (p IncidentOperationPredicate) Matches(input Incident) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2023-02-01/metadata/predicates.go b/resource-manager/securityinsights/2023-02-01/metadata/predicates.go
index fceef75135a..11492b7da36 100644
--- a/resource-manager/securityinsights/2023-02-01/metadata/predicates.go
+++ b/resource-manager/securityinsights/2023-02-01/metadata/predicates.go
@@ -12,19 +12,19 @@ type MetadataModelOperationPredicate struct {
 
 func (p MetadataModelOperationPredicate) Matches(input MetadataModel) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2023-02-01/watchlistitems/predicates.go b/resource-manager/securityinsights/2023-02-01/watchlistitems/predicates.go
index d595873ebcf..c9960b515cb 100644
--- a/resource-manager/securityinsights/2023-02-01/watchlistitems/predicates.go
+++ b/resource-manager/securityinsights/2023-02-01/watchlistitems/predicates.go
@@ -12,19 +12,19 @@ type WatchlistItemOperationPredicate struct {
 
 func (p WatchlistItemOperationPredicate) Matches(input WatchlistItem) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/securityinsights/2023-02-01/watchlists/predicates.go b/resource-manager/securityinsights/2023-02-01/watchlists/predicates.go
index 1b743bb52b6..f335c7c61ff 100644
--- a/resource-manager/securityinsights/2023-02-01/watchlists/predicates.go
+++ b/resource-manager/securityinsights/2023-02-01/watchlists/predicates.go
@@ -12,19 +12,19 @@ type WatchlistOperationPredicate struct {
 
 func (p WatchlistOperationPredicate) Matches(input Watchlist) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2021-06-01-preview/disasterrecoveryconfigs/predicates.go b/resource-manager/servicebus/2021-06-01-preview/disasterrecoveryconfigs/predicates.go
index 6966828af41..c231914332d 100644
--- a/resource-manager/servicebus/2021-06-01-preview/disasterrecoveryconfigs/predicates.go
+++ b/resource-manager/servicebus/2021-06-01-preview/disasterrecoveryconfigs/predicates.go
@@ -11,15 +11,15 @@ type ArmDisasterRecoveryOperationPredicate struct {
 
 func (p ArmDisasterRecoveryOperationPredicate) Matches(input ArmDisasterRecovery) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type SBAuthorizationRuleOperationPredicate struct {
 
 func (p SBAuthorizationRuleOperationPredicate) Matches(input SBAuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2021-06-01-preview/migrationconfigs/predicates.go b/resource-manager/servicebus/2021-06-01-preview/migrationconfigs/predicates.go
index 85757f34ab2..7318dd51d53 100644
--- a/resource-manager/servicebus/2021-06-01-preview/migrationconfigs/predicates.go
+++ b/resource-manager/servicebus/2021-06-01-preview/migrationconfigs/predicates.go
@@ -11,15 +11,15 @@ type MigrationConfigPropertiesOperationPredicate struct {
 
 func (p MigrationConfigPropertiesOperationPredicate) Matches(input MigrationConfigProperties) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2021-06-01-preview/namespaces/predicates.go b/resource-manager/servicebus/2021-06-01-preview/namespaces/predicates.go
index 3b711895874..71e4f727f9f 100644
--- a/resource-manager/servicebus/2021-06-01-preview/namespaces/predicates.go
+++ b/resource-manager/servicebus/2021-06-01-preview/namespaces/predicates.go
@@ -11,15 +11,15 @@ type NetworkRuleSetOperationPredicate struct {
 
 func (p NetworkRuleSetOperationPredicate) Matches(input NetworkRuleSet) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -35,7 +35,7 @@ type SBNamespaceOperationPredicate struct {
 
 func (p SBNamespaceOperationPredicate) Matches(input SBNamespace) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -43,11 +43,11 @@ func (p SBNamespaceOperationPredicate) Matches(input SBNamespace) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2021-06-01-preview/namespacesauthorizationrule/predicates.go b/resource-manager/servicebus/2021-06-01-preview/namespacesauthorizationrule/predicates.go
index a5ac3a02410..d8ba1404593 100644
--- a/resource-manager/servicebus/2021-06-01-preview/namespacesauthorizationrule/predicates.go
+++ b/resource-manager/servicebus/2021-06-01-preview/namespacesauthorizationrule/predicates.go
@@ -11,15 +11,15 @@ type SBAuthorizationRuleOperationPredicate struct {
 
 func (p SBAuthorizationRuleOperationPredicate) Matches(input SBAuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2021-06-01-preview/namespacesprivateendpointconnections/predicates.go b/resource-manager/servicebus/2021-06-01-preview/namespacesprivateendpointconnections/predicates.go
index 3a8733a0989..186c91f9bdc 100644
--- a/resource-manager/servicebus/2021-06-01-preview/namespacesprivateendpointconnections/predicates.go
+++ b/resource-manager/servicebus/2021-06-01-preview/namespacesprivateendpointconnections/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2021-06-01-preview/queues/predicates.go b/resource-manager/servicebus/2021-06-01-preview/queues/predicates.go
index 5e271c20cca..2e9cb38c8bc 100644
--- a/resource-manager/servicebus/2021-06-01-preview/queues/predicates.go
+++ b/resource-manager/servicebus/2021-06-01-preview/queues/predicates.go
@@ -11,15 +11,15 @@ type SBQueueOperationPredicate struct {
 
 func (p SBQueueOperationPredicate) Matches(input SBQueue) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2021-06-01-preview/queuesauthorizationrule/predicates.go b/resource-manager/servicebus/2021-06-01-preview/queuesauthorizationrule/predicates.go
index 20841eb5118..e971a5380b8 100644
--- a/resource-manager/servicebus/2021-06-01-preview/queuesauthorizationrule/predicates.go
+++ b/resource-manager/servicebus/2021-06-01-preview/queuesauthorizationrule/predicates.go
@@ -11,15 +11,15 @@ type SBAuthorizationRuleOperationPredicate struct {
 
 func (p SBAuthorizationRuleOperationPredicate) Matches(input SBAuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2021-06-01-preview/rules/predicates.go b/resource-manager/servicebus/2021-06-01-preview/rules/predicates.go
index 1fc45536941..0dd99d7ba7d 100644
--- a/resource-manager/servicebus/2021-06-01-preview/rules/predicates.go
+++ b/resource-manager/servicebus/2021-06-01-preview/rules/predicates.go
@@ -11,15 +11,15 @@ type RuleOperationPredicate struct {
 
 func (p RuleOperationPredicate) Matches(input Rule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2021-06-01-preview/subscriptions/predicates.go b/resource-manager/servicebus/2021-06-01-preview/subscriptions/predicates.go
index 1d8bb2d4508..74030836f15 100644
--- a/resource-manager/servicebus/2021-06-01-preview/subscriptions/predicates.go
+++ b/resource-manager/servicebus/2021-06-01-preview/subscriptions/predicates.go
@@ -11,15 +11,15 @@ type SBSubscriptionOperationPredicate struct {
 
 func (p SBSubscriptionOperationPredicate) Matches(input SBSubscription) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2021-06-01-preview/topics/predicates.go b/resource-manager/servicebus/2021-06-01-preview/topics/predicates.go
index 235212a27f9..e3d8e20a7e3 100644
--- a/resource-manager/servicebus/2021-06-01-preview/topics/predicates.go
+++ b/resource-manager/servicebus/2021-06-01-preview/topics/predicates.go
@@ -11,15 +11,15 @@ type SBTopicOperationPredicate struct {
 
 func (p SBTopicOperationPredicate) Matches(input SBTopic) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2021-06-01-preview/topicsauthorizationrule/predicates.go b/resource-manager/servicebus/2021-06-01-preview/topicsauthorizationrule/predicates.go
index ed6b1237388..5e7135acefb 100644
--- a/resource-manager/servicebus/2021-06-01-preview/topicsauthorizationrule/predicates.go
+++ b/resource-manager/servicebus/2021-06-01-preview/topicsauthorizationrule/predicates.go
@@ -11,15 +11,15 @@ type SBAuthorizationRuleOperationPredicate struct {
 
 func (p SBAuthorizationRuleOperationPredicate) Matches(input SBAuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2021-11-01/disasterrecoveryconfigs/predicates.go b/resource-manager/servicebus/2021-11-01/disasterrecoveryconfigs/predicates.go
index fd250ccc65c..1c6378195c9 100644
--- a/resource-manager/servicebus/2021-11-01/disasterrecoveryconfigs/predicates.go
+++ b/resource-manager/servicebus/2021-11-01/disasterrecoveryconfigs/predicates.go
@@ -12,19 +12,19 @@ type ArmDisasterRecoveryOperationPredicate struct {
 
 func (p ArmDisasterRecoveryOperationPredicate) Matches(input ArmDisasterRecovery) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,19 +40,19 @@ type SBAuthorizationRuleOperationPredicate struct {
 
 func (p SBAuthorizationRuleOperationPredicate) Matches(input SBAuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2021-11-01/migrationconfigs/predicates.go b/resource-manager/servicebus/2021-11-01/migrationconfigs/predicates.go
index a17c6dfd5ca..17c6be92d46 100644
--- a/resource-manager/servicebus/2021-11-01/migrationconfigs/predicates.go
+++ b/resource-manager/servicebus/2021-11-01/migrationconfigs/predicates.go
@@ -12,19 +12,19 @@ type MigrationConfigPropertiesOperationPredicate struct {
 
 func (p MigrationConfigPropertiesOperationPredicate) Matches(input MigrationConfigProperties) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2021-11-01/namespaces/predicates.go b/resource-manager/servicebus/2021-11-01/namespaces/predicates.go
index 48fca63c31f..ebae7a13e34 100644
--- a/resource-manager/servicebus/2021-11-01/namespaces/predicates.go
+++ b/resource-manager/servicebus/2021-11-01/namespaces/predicates.go
@@ -12,19 +12,19 @@ type NetworkRuleSetOperationPredicate struct {
 
 func (p NetworkRuleSetOperationPredicate) Matches(input NetworkRuleSet) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,7 +40,7 @@ type SBNamespaceOperationPredicate struct {
 
 func (p SBNamespaceOperationPredicate) Matches(input SBNamespace) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -48,11 +48,11 @@ func (p SBNamespaceOperationPredicate) Matches(input SBNamespace) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2021-11-01/namespacesauthorizationrule/predicates.go b/resource-manager/servicebus/2021-11-01/namespacesauthorizationrule/predicates.go
index 1695f706f5a..b0b7ca9cdce 100644
--- a/resource-manager/servicebus/2021-11-01/namespacesauthorizationrule/predicates.go
+++ b/resource-manager/servicebus/2021-11-01/namespacesauthorizationrule/predicates.go
@@ -12,19 +12,19 @@ type SBAuthorizationRuleOperationPredicate struct {
 
 func (p SBAuthorizationRuleOperationPredicate) Matches(input SBAuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2021-11-01/namespacesprivateendpointconnections/predicates.go b/resource-manager/servicebus/2021-11-01/namespacesprivateendpointconnections/predicates.go
index 5a8a3fa3b56..f1b8f930ec1 100644
--- a/resource-manager/servicebus/2021-11-01/namespacesprivateendpointconnections/predicates.go
+++ b/resource-manager/servicebus/2021-11-01/namespacesprivateendpointconnections/predicates.go
@@ -12,19 +12,19 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2021-11-01/queues/predicates.go b/resource-manager/servicebus/2021-11-01/queues/predicates.go
index 5f54370a69c..142340de749 100644
--- a/resource-manager/servicebus/2021-11-01/queues/predicates.go
+++ b/resource-manager/servicebus/2021-11-01/queues/predicates.go
@@ -12,19 +12,19 @@ type SBQueueOperationPredicate struct {
 
 func (p SBQueueOperationPredicate) Matches(input SBQueue) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2021-11-01/queuesauthorizationrule/predicates.go b/resource-manager/servicebus/2021-11-01/queuesauthorizationrule/predicates.go
index 7fa4b597dcf..cd27f28290b 100644
--- a/resource-manager/servicebus/2021-11-01/queuesauthorizationrule/predicates.go
+++ b/resource-manager/servicebus/2021-11-01/queuesauthorizationrule/predicates.go
@@ -12,19 +12,19 @@ type SBAuthorizationRuleOperationPredicate struct {
 
 func (p SBAuthorizationRuleOperationPredicate) Matches(input SBAuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2021-11-01/rules/predicates.go b/resource-manager/servicebus/2021-11-01/rules/predicates.go
index bcf0927799f..8570a09bbea 100644
--- a/resource-manager/servicebus/2021-11-01/rules/predicates.go
+++ b/resource-manager/servicebus/2021-11-01/rules/predicates.go
@@ -12,19 +12,19 @@ type RuleOperationPredicate struct {
 
 func (p RuleOperationPredicate) Matches(input Rule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2021-11-01/subscriptions/predicates.go b/resource-manager/servicebus/2021-11-01/subscriptions/predicates.go
index f5a8ccb1612..218fef69f20 100644
--- a/resource-manager/servicebus/2021-11-01/subscriptions/predicates.go
+++ b/resource-manager/servicebus/2021-11-01/subscriptions/predicates.go
@@ -12,19 +12,19 @@ type SBSubscriptionOperationPredicate struct {
 
 func (p SBSubscriptionOperationPredicate) Matches(input SBSubscription) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2021-11-01/topics/predicates.go b/resource-manager/servicebus/2021-11-01/topics/predicates.go
index 40dac8358a4..b5ff4e14c2c 100644
--- a/resource-manager/servicebus/2021-11-01/topics/predicates.go
+++ b/resource-manager/servicebus/2021-11-01/topics/predicates.go
@@ -12,19 +12,19 @@ type SBTopicOperationPredicate struct {
 
 func (p SBTopicOperationPredicate) Matches(input SBTopic) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2021-11-01/topicsauthorizationrule/predicates.go b/resource-manager/servicebus/2021-11-01/topicsauthorizationrule/predicates.go
index bd6a142d125..0814ac6507a 100644
--- a/resource-manager/servicebus/2021-11-01/topicsauthorizationrule/predicates.go
+++ b/resource-manager/servicebus/2021-11-01/topicsauthorizationrule/predicates.go
@@ -12,19 +12,19 @@ type SBAuthorizationRuleOperationPredicate struct {
 
 func (p SBAuthorizationRuleOperationPredicate) Matches(input SBAuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2022-01-01-preview/disasterrecoveryconfigs/predicates.go b/resource-manager/servicebus/2022-01-01-preview/disasterrecoveryconfigs/predicates.go
index fd250ccc65c..1c6378195c9 100644
--- a/resource-manager/servicebus/2022-01-01-preview/disasterrecoveryconfigs/predicates.go
+++ b/resource-manager/servicebus/2022-01-01-preview/disasterrecoveryconfigs/predicates.go
@@ -12,19 +12,19 @@ type ArmDisasterRecoveryOperationPredicate struct {
 
 func (p ArmDisasterRecoveryOperationPredicate) Matches(input ArmDisasterRecovery) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,19 +40,19 @@ type SBAuthorizationRuleOperationPredicate struct {
 
 func (p SBAuthorizationRuleOperationPredicate) Matches(input SBAuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2022-01-01-preview/migrationconfigs/predicates.go b/resource-manager/servicebus/2022-01-01-preview/migrationconfigs/predicates.go
index a17c6dfd5ca..17c6be92d46 100644
--- a/resource-manager/servicebus/2022-01-01-preview/migrationconfigs/predicates.go
+++ b/resource-manager/servicebus/2022-01-01-preview/migrationconfigs/predicates.go
@@ -12,19 +12,19 @@ type MigrationConfigPropertiesOperationPredicate struct {
 
 func (p MigrationConfigPropertiesOperationPredicate) Matches(input MigrationConfigProperties) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2022-01-01-preview/namespaces/predicates.go b/resource-manager/servicebus/2022-01-01-preview/namespaces/predicates.go
index 48fca63c31f..ebae7a13e34 100644
--- a/resource-manager/servicebus/2022-01-01-preview/namespaces/predicates.go
+++ b/resource-manager/servicebus/2022-01-01-preview/namespaces/predicates.go
@@ -12,19 +12,19 @@ type NetworkRuleSetOperationPredicate struct {
 
 func (p NetworkRuleSetOperationPredicate) Matches(input NetworkRuleSet) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,7 +40,7 @@ type SBNamespaceOperationPredicate struct {
 
 func (p SBNamespaceOperationPredicate) Matches(input SBNamespace) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -48,11 +48,11 @@ func (p SBNamespaceOperationPredicate) Matches(input SBNamespace) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2022-01-01-preview/namespacesauthorizationrule/predicates.go b/resource-manager/servicebus/2022-01-01-preview/namespacesauthorizationrule/predicates.go
index 1695f706f5a..b0b7ca9cdce 100644
--- a/resource-manager/servicebus/2022-01-01-preview/namespacesauthorizationrule/predicates.go
+++ b/resource-manager/servicebus/2022-01-01-preview/namespacesauthorizationrule/predicates.go
@@ -12,19 +12,19 @@ type SBAuthorizationRuleOperationPredicate struct {
 
 func (p SBAuthorizationRuleOperationPredicate) Matches(input SBAuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2022-01-01-preview/namespacesprivateendpointconnections/predicates.go b/resource-manager/servicebus/2022-01-01-preview/namespacesprivateendpointconnections/predicates.go
index 5a8a3fa3b56..f1b8f930ec1 100644
--- a/resource-manager/servicebus/2022-01-01-preview/namespacesprivateendpointconnections/predicates.go
+++ b/resource-manager/servicebus/2022-01-01-preview/namespacesprivateendpointconnections/predicates.go
@@ -12,19 +12,19 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2022-01-01-preview/queues/predicates.go b/resource-manager/servicebus/2022-01-01-preview/queues/predicates.go
index 5f54370a69c..142340de749 100644
--- a/resource-manager/servicebus/2022-01-01-preview/queues/predicates.go
+++ b/resource-manager/servicebus/2022-01-01-preview/queues/predicates.go
@@ -12,19 +12,19 @@ type SBQueueOperationPredicate struct {
 
 func (p SBQueueOperationPredicate) Matches(input SBQueue) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2022-01-01-preview/queuesauthorizationrule/predicates.go b/resource-manager/servicebus/2022-01-01-preview/queuesauthorizationrule/predicates.go
index 7fa4b597dcf..cd27f28290b 100644
--- a/resource-manager/servicebus/2022-01-01-preview/queuesauthorizationrule/predicates.go
+++ b/resource-manager/servicebus/2022-01-01-preview/queuesauthorizationrule/predicates.go
@@ -12,19 +12,19 @@ type SBAuthorizationRuleOperationPredicate struct {
 
 func (p SBAuthorizationRuleOperationPredicate) Matches(input SBAuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2022-01-01-preview/rules/predicates.go b/resource-manager/servicebus/2022-01-01-preview/rules/predicates.go
index bcf0927799f..8570a09bbea 100644
--- a/resource-manager/servicebus/2022-01-01-preview/rules/predicates.go
+++ b/resource-manager/servicebus/2022-01-01-preview/rules/predicates.go
@@ -12,19 +12,19 @@ type RuleOperationPredicate struct {
 
 func (p RuleOperationPredicate) Matches(input Rule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2022-01-01-preview/subscriptions/predicates.go b/resource-manager/servicebus/2022-01-01-preview/subscriptions/predicates.go
index f5a8ccb1612..218fef69f20 100644
--- a/resource-manager/servicebus/2022-01-01-preview/subscriptions/predicates.go
+++ b/resource-manager/servicebus/2022-01-01-preview/subscriptions/predicates.go
@@ -12,19 +12,19 @@ type SBSubscriptionOperationPredicate struct {
 
 func (p SBSubscriptionOperationPredicate) Matches(input SBSubscription) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2022-01-01-preview/topics/predicates.go b/resource-manager/servicebus/2022-01-01-preview/topics/predicates.go
index 40dac8358a4..b5ff4e14c2c 100644
--- a/resource-manager/servicebus/2022-01-01-preview/topics/predicates.go
+++ b/resource-manager/servicebus/2022-01-01-preview/topics/predicates.go
@@ -12,19 +12,19 @@ type SBTopicOperationPredicate struct {
 
 func (p SBTopicOperationPredicate) Matches(input SBTopic) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicebus/2022-01-01-preview/topicsauthorizationrule/predicates.go b/resource-manager/servicebus/2022-01-01-preview/topicsauthorizationrule/predicates.go
index bd6a142d125..0814ac6507a 100644
--- a/resource-manager/servicebus/2022-01-01-preview/topicsauthorizationrule/predicates.go
+++ b/resource-manager/servicebus/2022-01-01-preview/topicsauthorizationrule/predicates.go
@@ -12,19 +12,19 @@ type SBAuthorizationRuleOperationPredicate struct {
 
 func (p SBAuthorizationRuleOperationPredicate) Matches(input SBAuthorizationRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicefabricmanagedcluster/2021-05-01/application/predicates.go b/resource-manager/servicefabricmanagedcluster/2021-05-01/application/predicates.go
index 40251f9d1d1..908be2b26b6 100644
--- a/resource-manager/servicefabricmanagedcluster/2021-05-01/application/predicates.go
+++ b/resource-manager/servicefabricmanagedcluster/2021-05-01/application/predicates.go
@@ -12,19 +12,19 @@ type ApplicationResourceOperationPredicate struct {
 
 func (p ApplicationResourceOperationPredicate) Matches(input ApplicationResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicefabricmanagedcluster/2021-05-01/applicationtype/predicates.go b/resource-manager/servicefabricmanagedcluster/2021-05-01/applicationtype/predicates.go
index 45d64b2401c..e7ba87695dd 100644
--- a/resource-manager/servicefabricmanagedcluster/2021-05-01/applicationtype/predicates.go
+++ b/resource-manager/servicefabricmanagedcluster/2021-05-01/applicationtype/predicates.go
@@ -12,19 +12,19 @@ type ApplicationTypeResourceOperationPredicate struct {
 
 func (p ApplicationTypeResourceOperationPredicate) Matches(input ApplicationTypeResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicefabricmanagedcluster/2021-05-01/applicationtypeversion/predicates.go b/resource-manager/servicefabricmanagedcluster/2021-05-01/applicationtypeversion/predicates.go
index 95fe6c9c4f4..a5ea562b77d 100644
--- a/resource-manager/servicefabricmanagedcluster/2021-05-01/applicationtypeversion/predicates.go
+++ b/resource-manager/servicefabricmanagedcluster/2021-05-01/applicationtypeversion/predicates.go
@@ -12,19 +12,19 @@ type ApplicationTypeVersionResourceOperationPredicate struct {
 
 func (p ApplicationTypeVersionResourceOperationPredicate) Matches(input ApplicationTypeVersionResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicefabricmanagedcluster/2021-05-01/managedcluster/predicates.go b/resource-manager/servicefabricmanagedcluster/2021-05-01/managedcluster/predicates.go
index c9594c4c34c..26255b3e999 100644
--- a/resource-manager/servicefabricmanagedcluster/2021-05-01/managedcluster/predicates.go
+++ b/resource-manager/servicefabricmanagedcluster/2021-05-01/managedcluster/predicates.go
@@ -13,11 +13,11 @@ type ManagedClusterOperationPredicate struct {
 
 func (p ManagedClusterOperationPredicate) Matches(input ManagedCluster) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p ManagedClusterOperationPredicate) Matches(input ManagedCluster) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicefabricmanagedcluster/2021-05-01/nodetype/predicates.go b/resource-manager/servicefabricmanagedcluster/2021-05-01/nodetype/predicates.go
index a010a34fbfa..aa044ec0f5c 100644
--- a/resource-manager/servicefabricmanagedcluster/2021-05-01/nodetype/predicates.go
+++ b/resource-manager/servicefabricmanagedcluster/2021-05-01/nodetype/predicates.go
@@ -11,15 +11,15 @@ type NodeTypeOperationPredicate struct {
 
 func (p NodeTypeOperationPredicate) Matches(input NodeType) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicefabricmanagedcluster/2021-05-01/service/predicates.go b/resource-manager/servicefabricmanagedcluster/2021-05-01/service/predicates.go
index e03409fa541..a8b0ffd4cca 100644
--- a/resource-manager/servicefabricmanagedcluster/2021-05-01/service/predicates.go
+++ b/resource-manager/servicefabricmanagedcluster/2021-05-01/service/predicates.go
@@ -12,19 +12,19 @@ type ServiceResourceOperationPredicate struct {
 
 func (p ServiceResourceOperationPredicate) Matches(input ServiceResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicefabricmanagedcluster/2022-01-01/application/predicates.go b/resource-manager/servicefabricmanagedcluster/2022-01-01/application/predicates.go
index 40251f9d1d1..908be2b26b6 100644
--- a/resource-manager/servicefabricmanagedcluster/2022-01-01/application/predicates.go
+++ b/resource-manager/servicefabricmanagedcluster/2022-01-01/application/predicates.go
@@ -12,19 +12,19 @@ type ApplicationResourceOperationPredicate struct {
 
 func (p ApplicationResourceOperationPredicate) Matches(input ApplicationResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicefabricmanagedcluster/2022-01-01/applicationtype/predicates.go b/resource-manager/servicefabricmanagedcluster/2022-01-01/applicationtype/predicates.go
index 45d64b2401c..e7ba87695dd 100644
--- a/resource-manager/servicefabricmanagedcluster/2022-01-01/applicationtype/predicates.go
+++ b/resource-manager/servicefabricmanagedcluster/2022-01-01/applicationtype/predicates.go
@@ -12,19 +12,19 @@ type ApplicationTypeResourceOperationPredicate struct {
 
 func (p ApplicationTypeResourceOperationPredicate) Matches(input ApplicationTypeResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicefabricmanagedcluster/2022-01-01/applicationtypeversion/predicates.go b/resource-manager/servicefabricmanagedcluster/2022-01-01/applicationtypeversion/predicates.go
index 95fe6c9c4f4..a5ea562b77d 100644
--- a/resource-manager/servicefabricmanagedcluster/2022-01-01/applicationtypeversion/predicates.go
+++ b/resource-manager/servicefabricmanagedcluster/2022-01-01/applicationtypeversion/predicates.go
@@ -12,19 +12,19 @@ type ApplicationTypeVersionResourceOperationPredicate struct {
 
 func (p ApplicationTypeVersionResourceOperationPredicate) Matches(input ApplicationTypeVersionResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicefabricmanagedcluster/2022-01-01/managedcluster/predicates.go b/resource-manager/servicefabricmanagedcluster/2022-01-01/managedcluster/predicates.go
index c9594c4c34c..26255b3e999 100644
--- a/resource-manager/servicefabricmanagedcluster/2022-01-01/managedcluster/predicates.go
+++ b/resource-manager/servicefabricmanagedcluster/2022-01-01/managedcluster/predicates.go
@@ -13,11 +13,11 @@ type ManagedClusterOperationPredicate struct {
 
 func (p ManagedClusterOperationPredicate) Matches(input ManagedCluster) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p ManagedClusterOperationPredicate) Matches(input ManagedCluster) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicefabricmanagedcluster/2022-01-01/managedvmsizes/predicates.go b/resource-manager/servicefabricmanagedcluster/2022-01-01/managedvmsizes/predicates.go
index 9ee7cd1d2c5..9a2b31cab88 100644
--- a/resource-manager/servicefabricmanagedcluster/2022-01-01/managedvmsizes/predicates.go
+++ b/resource-manager/servicefabricmanagedcluster/2022-01-01/managedvmsizes/predicates.go
@@ -11,15 +11,15 @@ type ManagedVMSizeOperationPredicate struct {
 
 func (p ManagedVMSizeOperationPredicate) Matches(input ManagedVMSize) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicefabricmanagedcluster/2022-01-01/nodetype/predicates.go b/resource-manager/servicefabricmanagedcluster/2022-01-01/nodetype/predicates.go
index 28381abcabe..18091ff5ee6 100644
--- a/resource-manager/servicefabricmanagedcluster/2022-01-01/nodetype/predicates.go
+++ b/resource-manager/servicefabricmanagedcluster/2022-01-01/nodetype/predicates.go
@@ -11,15 +11,15 @@ type NodeTypeOperationPredicate struct {
 
 func (p NodeTypeOperationPredicate) Matches(input NodeType) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -32,7 +32,7 @@ type NodeTypeAvailableSkuOperationPredicate struct {
 
 func (p NodeTypeAvailableSkuOperationPredicate) Matches(input NodeTypeAvailableSku) bool {
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
diff --git a/resource-manager/servicefabricmanagedcluster/2022-01-01/service/predicates.go b/resource-manager/servicefabricmanagedcluster/2022-01-01/service/predicates.go
index e03409fa541..a8b0ffd4cca 100644
--- a/resource-manager/servicefabricmanagedcluster/2022-01-01/service/predicates.go
+++ b/resource-manager/servicefabricmanagedcluster/2022-01-01/service/predicates.go
@@ -12,19 +12,19 @@ type ServiceResourceOperationPredicate struct {
 
 func (p ServiceResourceOperationPredicate) Matches(input ServiceResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicelinker/2022-05-01/servicelinker/predicates.go b/resource-manager/servicelinker/2022-05-01/servicelinker/predicates.go
index a4f74b6aecb..cc30c5c01cd 100644
--- a/resource-manager/servicelinker/2022-05-01/servicelinker/predicates.go
+++ b/resource-manager/servicelinker/2022-05-01/servicelinker/predicates.go
@@ -11,15 +11,15 @@ type LinkerResourceOperationPredicate struct {
 
 func (p LinkerResourceOperationPredicate) Matches(input LinkerResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicenetworking/2023-05-01-preview/associationsinterface/predicates.go b/resource-manager/servicenetworking/2023-05-01-preview/associationsinterface/predicates.go
index 9840026ea7b..52d86740212 100644
--- a/resource-manager/servicenetworking/2023-05-01-preview/associationsinterface/predicates.go
+++ b/resource-manager/servicenetworking/2023-05-01-preview/associationsinterface/predicates.go
@@ -12,7 +12,7 @@ type AssociationOperationPredicate struct {
 
 func (p AssociationOperationPredicate) Matches(input Association) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p AssociationOperationPredicate) Matches(input Association) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicenetworking/2023-05-01-preview/frontendsinterface/predicates.go b/resource-manager/servicenetworking/2023-05-01-preview/frontendsinterface/predicates.go
index c83bb006b3f..15b28850961 100644
--- a/resource-manager/servicenetworking/2023-05-01-preview/frontendsinterface/predicates.go
+++ b/resource-manager/servicenetworking/2023-05-01-preview/frontendsinterface/predicates.go
@@ -12,7 +12,7 @@ type FrontendOperationPredicate struct {
 
 func (p FrontendOperationPredicate) Matches(input Frontend) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p FrontendOperationPredicate) Matches(input Frontend) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/servicenetworking/2023-05-01-preview/trafficcontrollerinterface/predicates.go b/resource-manager/servicenetworking/2023-05-01-preview/trafficcontrollerinterface/predicates.go
index 4e123e41517..3f8bcc32db3 100644
--- a/resource-manager/servicenetworking/2023-05-01-preview/trafficcontrollerinterface/predicates.go
+++ b/resource-manager/servicenetworking/2023-05-01-preview/trafficcontrollerinterface/predicates.go
@@ -12,7 +12,7 @@ type TrafficControllerOperationPredicate struct {
 
 func (p TrafficControllerOperationPredicate) Matches(input TrafficController) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p TrafficControllerOperationPredicate) Matches(input TrafficController) bo
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/signalr/2023-02-01/signalr/predicates.go b/resource-manager/signalr/2023-02-01/signalr/predicates.go
index 3d91bb4a851..2af75acf98d 100644
--- a/resource-manager/signalr/2023-02-01/signalr/predicates.go
+++ b/resource-manager/signalr/2023-02-01/signalr/predicates.go
@@ -11,15 +11,15 @@ type CustomCertificateOperationPredicate struct {
 
 func (p CustomCertificateOperationPredicate) Matches(input CustomCertificate) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type CustomDomainOperationPredicate struct {
 
 func (p CustomDomainOperationPredicate) Matches(input CustomDomain) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -57,15 +57,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -80,15 +80,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -103,15 +103,15 @@ type SharedPrivateLinkResourceOperationPredicate struct {
 
 func (p SharedPrivateLinkResourceOperationPredicate) Matches(input SharedPrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -127,19 +127,19 @@ type SignalRResourceOperationPredicate struct {
 
 func (p SignalRResourceOperationPredicate) Matches(input SignalRResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -155,19 +155,19 @@ type SignalRUsageOperationPredicate struct {
 
 func (p SignalRUsageOperationPredicate) Matches(input SignalRUsage) bool {
 
-	if p.CurrentValue != nil && (input.CurrentValue == nil && *p.CurrentValue != *input.CurrentValue) {
+	if p.CurrentValue != nil && (input.CurrentValue == nil || *p.CurrentValue != *input.CurrentValue) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
-	if p.Unit != nil && (input.Unit == nil && *p.Unit != *input.Unit) {
+	if p.Unit != nil && (input.Unit == nil || *p.Unit != *input.Unit) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/blobauditing/predicates.go b/resource-manager/sql/2017-03-01-preview/blobauditing/predicates.go
index 7dc2c7bce7c..0515898ea7f 100644
--- a/resource-manager/sql/2017-03-01-preview/blobauditing/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/blobauditing/predicates.go
@@ -12,19 +12,19 @@ type DatabaseBlobAuditingPolicyOperationPredicate struct {
 
 func (p DatabaseBlobAuditingPolicyOperationPredicate) Matches(input DatabaseBlobAuditingPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -39,15 +39,15 @@ type ExtendedDatabaseBlobAuditingPolicyOperationPredicate struct {
 
 func (p ExtendedDatabaseBlobAuditingPolicyOperationPredicate) Matches(input ExtendedDatabaseBlobAuditingPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -62,15 +62,15 @@ type ExtendedServerBlobAuditingPolicyOperationPredicate struct {
 
 func (p ExtendedServerBlobAuditingPolicyOperationPredicate) Matches(input ExtendedServerBlobAuditingPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -85,15 +85,15 @@ type ServerBlobAuditingPolicyOperationPredicate struct {
 
 func (p ServerBlobAuditingPolicyOperationPredicate) Matches(input ServerBlobAuditingPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/databases/predicates.go b/resource-manager/sql/2017-03-01-preview/databases/predicates.go
index a3efd617698..8152a8e4f75 100644
--- a/resource-manager/sql/2017-03-01-preview/databases/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/databases/predicates.go
@@ -13,11 +13,11 @@ type DatabaseOperationPredicate struct {
 
 func (p DatabaseOperationPredicate) Matches(input Database) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p DatabaseOperationPredicate) Matches(input Database) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -44,15 +44,15 @@ type DatabaseOperationOperationPredicate struct {
 
 func (p DatabaseOperationOperationPredicate) Matches(input DatabaseOperation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/databasevulnerabilityassessments/predicates.go b/resource-manager/sql/2017-03-01-preview/databasevulnerabilityassessments/predicates.go
index a3e5cfec486..4f0c37586c8 100644
--- a/resource-manager/sql/2017-03-01-preview/databasevulnerabilityassessments/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/databasevulnerabilityassessments/predicates.go
@@ -11,15 +11,15 @@ type DatabaseVulnerabilityAssessmentOperationPredicate struct {
 
 func (p DatabaseVulnerabilityAssessmentOperationPredicate) Matches(input DatabaseVulnerabilityAssessment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/jobagents/predicates.go b/resource-manager/sql/2017-03-01-preview/jobagents/predicates.go
index 9af5edc96d3..0813f84a604 100644
--- a/resource-manager/sql/2017-03-01-preview/jobagents/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/jobagents/predicates.go
@@ -12,7 +12,7 @@ type JobAgentOperationPredicate struct {
 
 func (p JobAgentOperationPredicate) Matches(input JobAgent) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p JobAgentOperationPredicate) Matches(input JobAgent) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/jobcredentials/predicates.go b/resource-manager/sql/2017-03-01-preview/jobcredentials/predicates.go
index 3f5f9058d24..2aa2ac84e10 100644
--- a/resource-manager/sql/2017-03-01-preview/jobcredentials/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/jobcredentials/predicates.go
@@ -11,15 +11,15 @@ type JobCredentialOperationPredicate struct {
 
 func (p JobCredentialOperationPredicate) Matches(input JobCredential) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/jobexecutions/predicates.go b/resource-manager/sql/2017-03-01-preview/jobexecutions/predicates.go
index f216fc9c956..0f0cadef69d 100644
--- a/resource-manager/sql/2017-03-01-preview/jobexecutions/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/jobexecutions/predicates.go
@@ -11,15 +11,15 @@ type JobExecutionOperationPredicate struct {
 
 func (p JobExecutionOperationPredicate) Matches(input JobExecution) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/jobs/predicates.go b/resource-manager/sql/2017-03-01-preview/jobs/predicates.go
index 1722360a161..8326102dc52 100644
--- a/resource-manager/sql/2017-03-01-preview/jobs/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/jobs/predicates.go
@@ -11,15 +11,15 @@ type JobOperationPredicate struct {
 
 func (p JobOperationPredicate) Matches(input Job) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/jobstepexecutions/predicates.go b/resource-manager/sql/2017-03-01-preview/jobstepexecutions/predicates.go
index 620a69e91f0..9108f574a01 100644
--- a/resource-manager/sql/2017-03-01-preview/jobstepexecutions/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/jobstepexecutions/predicates.go
@@ -11,15 +11,15 @@ type JobExecutionOperationPredicate struct {
 
 func (p JobExecutionOperationPredicate) Matches(input JobExecution) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/jobsteps/predicates.go b/resource-manager/sql/2017-03-01-preview/jobsteps/predicates.go
index 0fd7a59f895..2011b5d8053 100644
--- a/resource-manager/sql/2017-03-01-preview/jobsteps/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/jobsteps/predicates.go
@@ -11,15 +11,15 @@ type JobStepOperationPredicate struct {
 
 func (p JobStepOperationPredicate) Matches(input JobStep) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/jobtargetexecutions/predicates.go b/resource-manager/sql/2017-03-01-preview/jobtargetexecutions/predicates.go
index d1c18ba9641..b2a71b3428f 100644
--- a/resource-manager/sql/2017-03-01-preview/jobtargetexecutions/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/jobtargetexecutions/predicates.go
@@ -11,15 +11,15 @@ type JobExecutionOperationPredicate struct {
 
 func (p JobExecutionOperationPredicate) Matches(input JobExecution) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/jobtargetgroups/predicates.go b/resource-manager/sql/2017-03-01-preview/jobtargetgroups/predicates.go
index 4707c2b9c81..b3389a0f643 100644
--- a/resource-manager/sql/2017-03-01-preview/jobtargetgroups/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/jobtargetgroups/predicates.go
@@ -11,15 +11,15 @@ type JobTargetGroupOperationPredicate struct {
 
 func (p JobTargetGroupOperationPredicate) Matches(input JobTargetGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/jobversions/predicates.go b/resource-manager/sql/2017-03-01-preview/jobversions/predicates.go
index 96f71f298aa..c1092c878ce 100644
--- a/resource-manager/sql/2017-03-01-preview/jobversions/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/jobversions/predicates.go
@@ -11,15 +11,15 @@ type ResourceOperationPredicate struct {
 
 func (p ResourceOperationPredicate) Matches(input Resource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/longtermretentionbackups/predicates.go b/resource-manager/sql/2017-03-01-preview/longtermretentionbackups/predicates.go
index 15f967d0f4e..3f2817fce24 100644
--- a/resource-manager/sql/2017-03-01-preview/longtermretentionbackups/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/longtermretentionbackups/predicates.go
@@ -11,15 +11,15 @@ type LongTermRetentionBackupOperationPredicate struct {
 
 func (p LongTermRetentionBackupOperationPredicate) Matches(input LongTermRetentionBackup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/managedbackupshorttermretentionpolicies/predicates.go b/resource-manager/sql/2017-03-01-preview/managedbackupshorttermretentionpolicies/predicates.go
index 310454c4447..fb75828a875 100644
--- a/resource-manager/sql/2017-03-01-preview/managedbackupshorttermretentionpolicies/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/managedbackupshorttermretentionpolicies/predicates.go
@@ -11,15 +11,15 @@ type ManagedBackupShortTermRetentionPolicyOperationPredicate struct {
 
 func (p ManagedBackupShortTermRetentionPolicyOperationPredicate) Matches(input ManagedBackupShortTermRetentionPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/manageddatabases/predicates.go b/resource-manager/sql/2017-03-01-preview/manageddatabases/predicates.go
index 66c91b2a27b..3841529c83e 100644
--- a/resource-manager/sql/2017-03-01-preview/manageddatabases/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/manageddatabases/predicates.go
@@ -12,7 +12,7 @@ type ManagedDatabaseOperationPredicate struct {
 
 func (p ManagedDatabaseOperationPredicate) Matches(input ManagedDatabase) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ManagedDatabaseOperationPredicate) Matches(input ManagedDatabase) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/manageddatabasesecurityalertpolicies/predicates.go b/resource-manager/sql/2017-03-01-preview/manageddatabasesecurityalertpolicies/predicates.go
index 4c8f2abc9ee..8cce85428fa 100644
--- a/resource-manager/sql/2017-03-01-preview/manageddatabasesecurityalertpolicies/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/manageddatabasesecurityalertpolicies/predicates.go
@@ -11,15 +11,15 @@ type ManagedDatabaseSecurityAlertPolicyOperationPredicate struct {
 
 func (p ManagedDatabaseSecurityAlertPolicyOperationPredicate) Matches(input ManagedDatabaseSecurityAlertPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/managedinstanceadministrators/predicates.go b/resource-manager/sql/2017-03-01-preview/managedinstanceadministrators/predicates.go
index 1e4aff885cf..d8dcbcc98be 100644
--- a/resource-manager/sql/2017-03-01-preview/managedinstanceadministrators/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/managedinstanceadministrators/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstanceAdministratorOperationPredicate struct {
 
 func (p ManagedInstanceAdministratorOperationPredicate) Matches(input ManagedInstanceAdministrator) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/managedrestorabledroppeddatabasebackupshorttermretentionpolicies/predicates.go b/resource-manager/sql/2017-03-01-preview/managedrestorabledroppeddatabasebackupshorttermretentionpolicies/predicates.go
index 0c7af11d4d5..c6890ca1ddf 100644
--- a/resource-manager/sql/2017-03-01-preview/managedrestorabledroppeddatabasebackupshorttermretentionpolicies/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/managedrestorabledroppeddatabasebackupshorttermretentionpolicies/predicates.go
@@ -11,15 +11,15 @@ type ManagedBackupShortTermRetentionPolicyOperationPredicate struct {
 
 func (p ManagedBackupShortTermRetentionPolicyOperationPredicate) Matches(input ManagedBackupShortTermRetentionPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/managedserversecurityalertpolicies/predicates.go b/resource-manager/sql/2017-03-01-preview/managedserversecurityalertpolicies/predicates.go
index 83e1986a11b..c7d46c58a0f 100644
--- a/resource-manager/sql/2017-03-01-preview/managedserversecurityalertpolicies/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/managedserversecurityalertpolicies/predicates.go
@@ -11,15 +11,15 @@ type ManagedServerSecurityAlertPolicyOperationPredicate struct {
 
 func (p ManagedServerSecurityAlertPolicyOperationPredicate) Matches(input ManagedServerSecurityAlertPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/restorabledroppedmanageddatabases/predicates.go b/resource-manager/sql/2017-03-01-preview/restorabledroppedmanageddatabases/predicates.go
index 02b9f5cb1ba..4ccec82b5ad 100644
--- a/resource-manager/sql/2017-03-01-preview/restorabledroppedmanageddatabases/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/restorabledroppedmanageddatabases/predicates.go
@@ -12,7 +12,7 @@ type RestorableDroppedManagedDatabaseOperationPredicate struct {
 
 func (p RestorableDroppedManagedDatabaseOperationPredicate) Matches(input RestorableDroppedManagedDatabase) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p RestorableDroppedManagedDatabaseOperationPredicate) Matches(input Restor
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/sensitivitylabels/predicates.go b/resource-manager/sql/2017-03-01-preview/sensitivitylabels/predicates.go
index d0a62c0b832..3f42c11e4b8 100644
--- a/resource-manager/sql/2017-03-01-preview/sensitivitylabels/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/sensitivitylabels/predicates.go
@@ -11,15 +11,15 @@ type SensitivityLabelOperationPredicate struct {
 
 func (p SensitivityLabelOperationPredicate) Matches(input SensitivityLabel) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/serverdnsaliases/predicates.go b/resource-manager/sql/2017-03-01-preview/serverdnsaliases/predicates.go
index dd46ec9f297..964f164db6c 100644
--- a/resource-manager/sql/2017-03-01-preview/serverdnsaliases/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/serverdnsaliases/predicates.go
@@ -11,15 +11,15 @@ type ServerDnsAliasOperationPredicate struct {
 
 func (p ServerDnsAliasOperationPredicate) Matches(input ServerDnsAlias) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2017-03-01-preview/serversecurityalertpolicies/predicates.go b/resource-manager/sql/2017-03-01-preview/serversecurityalertpolicies/predicates.go
index ac6768d8eb2..ff213a5f292 100644
--- a/resource-manager/sql/2017-03-01-preview/serversecurityalertpolicies/predicates.go
+++ b/resource-manager/sql/2017-03-01-preview/serversecurityalertpolicies/predicates.go
@@ -11,15 +11,15 @@ type ServerSecurityAlertPolicyOperationPredicate struct {
 
 func (p ServerSecurityAlertPolicyOperationPredicate) Matches(input ServerSecurityAlertPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2018-06-01-preview/databasecolumns/predicates.go b/resource-manager/sql/2018-06-01-preview/databasecolumns/predicates.go
index 5399b99c15e..bf9217e6d48 100644
--- a/resource-manager/sql/2018-06-01-preview/databasecolumns/predicates.go
+++ b/resource-manager/sql/2018-06-01-preview/databasecolumns/predicates.go
@@ -11,15 +11,15 @@ type DatabaseColumnOperationPredicate struct {
 
 func (p DatabaseColumnOperationPredicate) Matches(input DatabaseColumn) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2018-06-01-preview/databaseschemas/predicates.go b/resource-manager/sql/2018-06-01-preview/databaseschemas/predicates.go
index 01f468ac37b..641b6fac20c 100644
--- a/resource-manager/sql/2018-06-01-preview/databaseschemas/predicates.go
+++ b/resource-manager/sql/2018-06-01-preview/databaseschemas/predicates.go
@@ -11,15 +11,15 @@ type ResourceOperationPredicate struct {
 
 func (p ResourceOperationPredicate) Matches(input Resource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2018-06-01-preview/databasesecurityalertpolicies/predicates.go b/resource-manager/sql/2018-06-01-preview/databasesecurityalertpolicies/predicates.go
index 3e29fea7e5a..e1a8e1f4274 100644
--- a/resource-manager/sql/2018-06-01-preview/databasesecurityalertpolicies/predicates.go
+++ b/resource-manager/sql/2018-06-01-preview/databasesecurityalertpolicies/predicates.go
@@ -11,15 +11,15 @@ type DatabaseSecurityAlertPolicyOperationPredicate struct {
 
 func (p DatabaseSecurityAlertPolicyOperationPredicate) Matches(input DatabaseSecurityAlertPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2018-06-01-preview/databasetables/predicates.go b/resource-manager/sql/2018-06-01-preview/databasetables/predicates.go
index 4fdb1b268ac..2e692b11206 100644
--- a/resource-manager/sql/2018-06-01-preview/databasetables/predicates.go
+++ b/resource-manager/sql/2018-06-01-preview/databasetables/predicates.go
@@ -11,15 +11,15 @@ type ResourceOperationPredicate struct {
 
 func (p ResourceOperationPredicate) Matches(input Resource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2018-06-01-preview/instancepools/predicates.go b/resource-manager/sql/2018-06-01-preview/instancepools/predicates.go
index a569d211c2a..65903be2cc9 100644
--- a/resource-manager/sql/2018-06-01-preview/instancepools/predicates.go
+++ b/resource-manager/sql/2018-06-01-preview/instancepools/predicates.go
@@ -12,7 +12,7 @@ type InstancePoolOperationPredicate struct {
 
 func (p InstancePoolOperationPredicate) Matches(input InstancePool) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p InstancePoolOperationPredicate) Matches(input InstancePool) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2018-06-01-preview/longtermretentionmanagedinstancebackups/predicates.go b/resource-manager/sql/2018-06-01-preview/longtermretentionmanagedinstancebackups/predicates.go
index 5a23e86392f..0110d8aa257 100644
--- a/resource-manager/sql/2018-06-01-preview/longtermretentionmanagedinstancebackups/predicates.go
+++ b/resource-manager/sql/2018-06-01-preview/longtermretentionmanagedinstancebackups/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstanceLongTermRetentionBackupOperationPredicate struct {
 
 func (p ManagedInstanceLongTermRetentionBackupOperationPredicate) Matches(input ManagedInstanceLongTermRetentionBackup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2018-06-01-preview/manageddatabasecolumns/predicates.go b/resource-manager/sql/2018-06-01-preview/manageddatabasecolumns/predicates.go
index 4cf823a4f1f..e10d2347ca2 100644
--- a/resource-manager/sql/2018-06-01-preview/manageddatabasecolumns/predicates.go
+++ b/resource-manager/sql/2018-06-01-preview/manageddatabasecolumns/predicates.go
@@ -11,15 +11,15 @@ type DatabaseColumnOperationPredicate struct {
 
 func (p DatabaseColumnOperationPredicate) Matches(input DatabaseColumn) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2018-06-01-preview/manageddatabases/predicates.go b/resource-manager/sql/2018-06-01-preview/manageddatabases/predicates.go
index 66c91b2a27b..3841529c83e 100644
--- a/resource-manager/sql/2018-06-01-preview/manageddatabases/predicates.go
+++ b/resource-manager/sql/2018-06-01-preview/manageddatabases/predicates.go
@@ -12,7 +12,7 @@ type ManagedDatabaseOperationPredicate struct {
 
 func (p ManagedDatabaseOperationPredicate) Matches(input ManagedDatabase) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ManagedDatabaseOperationPredicate) Matches(input ManagedDatabase) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2018-06-01-preview/manageddatabaseschemas/predicates.go b/resource-manager/sql/2018-06-01-preview/manageddatabaseschemas/predicates.go
index 75bf2561c0f..92d0b757757 100644
--- a/resource-manager/sql/2018-06-01-preview/manageddatabaseschemas/predicates.go
+++ b/resource-manager/sql/2018-06-01-preview/manageddatabaseschemas/predicates.go
@@ -11,15 +11,15 @@ type ResourceOperationPredicate struct {
 
 func (p ResourceOperationPredicate) Matches(input Resource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2018-06-01-preview/manageddatabasesensitivitylabels/predicates.go b/resource-manager/sql/2018-06-01-preview/manageddatabasesensitivitylabels/predicates.go
index c64320f40cd..574240f237b 100644
--- a/resource-manager/sql/2018-06-01-preview/manageddatabasesensitivitylabels/predicates.go
+++ b/resource-manager/sql/2018-06-01-preview/manageddatabasesensitivitylabels/predicates.go
@@ -11,15 +11,15 @@ type SensitivityLabelOperationPredicate struct {
 
 func (p SensitivityLabelOperationPredicate) Matches(input SensitivityLabel) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2018-06-01-preview/manageddatabasetables/predicates.go b/resource-manager/sql/2018-06-01-preview/manageddatabasetables/predicates.go
index f145d23d22a..00b65bb2c52 100644
--- a/resource-manager/sql/2018-06-01-preview/manageddatabasetables/predicates.go
+++ b/resource-manager/sql/2018-06-01-preview/manageddatabasetables/predicates.go
@@ -11,15 +11,15 @@ type ResourceOperationPredicate struct {
 
 func (p ResourceOperationPredicate) Matches(input Resource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2018-06-01-preview/managedinstancelongtermretentionpolicies/predicates.go b/resource-manager/sql/2018-06-01-preview/managedinstancelongtermretentionpolicies/predicates.go
index 596418130f1..8ab8e0bab1f 100644
--- a/resource-manager/sql/2018-06-01-preview/managedinstancelongtermretentionpolicies/predicates.go
+++ b/resource-manager/sql/2018-06-01-preview/managedinstancelongtermretentionpolicies/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstanceLongTermRetentionPolicyOperationPredicate struct {
 
 func (p ManagedInstanceLongTermRetentionPolicyOperationPredicate) Matches(input ManagedInstanceLongTermRetentionPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2018-06-01-preview/managedinstanceoperations/predicates.go b/resource-manager/sql/2018-06-01-preview/managedinstanceoperations/predicates.go
index c3c281bd561..58a7ff1293e 100644
--- a/resource-manager/sql/2018-06-01-preview/managedinstanceoperations/predicates.go
+++ b/resource-manager/sql/2018-06-01-preview/managedinstanceoperations/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstanceOperationOperationPredicate struct {
 
 func (p ManagedInstanceOperationOperationPredicate) Matches(input ManagedInstanceOperation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2018-06-01-preview/managedinstances/predicates.go b/resource-manager/sql/2018-06-01-preview/managedinstances/predicates.go
index b88c1cd0502..fcd10c317ca 100644
--- a/resource-manager/sql/2018-06-01-preview/managedinstances/predicates.go
+++ b/resource-manager/sql/2018-06-01-preview/managedinstances/predicates.go
@@ -12,7 +12,7 @@ type ManagedInstanceOperationPredicate struct {
 
 func (p ManagedInstanceOperationPredicate) Matches(input ManagedInstance) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ManagedInstanceOperationPredicate) Matches(input ManagedInstance) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2018-06-01-preview/managedinstancevulnerabilityassessments/predicates.go b/resource-manager/sql/2018-06-01-preview/managedinstancevulnerabilityassessments/predicates.go
index 14b00fe56b2..74c244d5479 100644
--- a/resource-manager/sql/2018-06-01-preview/managedinstancevulnerabilityassessments/predicates.go
+++ b/resource-manager/sql/2018-06-01-preview/managedinstancevulnerabilityassessments/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstanceVulnerabilityAssessmentOperationPredicate struct {
 
 func (p ManagedInstanceVulnerabilityAssessmentOperationPredicate) Matches(input ManagedInstanceVulnerabilityAssessment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2018-06-01-preview/privateendpointconnections/predicates.go b/resource-manager/sql/2018-06-01-preview/privateendpointconnections/predicates.go
index bea3f66b397..4a03a91ce52 100644
--- a/resource-manager/sql/2018-06-01-preview/privateendpointconnections/predicates.go
+++ b/resource-manager/sql/2018-06-01-preview/privateendpointconnections/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2018-06-01-preview/privatelinkresources/predicates.go b/resource-manager/sql/2018-06-01-preview/privatelinkresources/predicates.go
index 29d787f073a..19b771c3994 100644
--- a/resource-manager/sql/2018-06-01-preview/privatelinkresources/predicates.go
+++ b/resource-manager/sql/2018-06-01-preview/privatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2018-06-01-preview/serverazureadadministrators/predicates.go b/resource-manager/sql/2018-06-01-preview/serverazureadadministrators/predicates.go
index 071f416faf3..8049433d6c4 100644
--- a/resource-manager/sql/2018-06-01-preview/serverazureadadministrators/predicates.go
+++ b/resource-manager/sql/2018-06-01-preview/serverazureadadministrators/predicates.go
@@ -11,15 +11,15 @@ type ServerAzureADAdministratorOperationPredicate struct {
 
 func (p ServerAzureADAdministratorOperationPredicate) Matches(input ServerAzureADAdministrator) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2018-06-01-preview/servervulnerabilityassessments/predicates.go b/resource-manager/sql/2018-06-01-preview/servervulnerabilityassessments/predicates.go
index 6adc538840b..cba9908c5fe 100644
--- a/resource-manager/sql/2018-06-01-preview/servervulnerabilityassessments/predicates.go
+++ b/resource-manager/sql/2018-06-01-preview/servervulnerabilityassessments/predicates.go
@@ -11,15 +11,15 @@ type ServerVulnerabilityAssessmentOperationPredicate struct {
 
 func (p ServerVulnerabilityAssessmentOperationPredicate) Matches(input ServerVulnerabilityAssessment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2018-06-01-preview/usages/predicates.go b/resource-manager/sql/2018-06-01-preview/usages/predicates.go
index bbcaf08d84d..38b0aa9b1f4 100644
--- a/resource-manager/sql/2018-06-01-preview/usages/predicates.go
+++ b/resource-manager/sql/2018-06-01-preview/usages/predicates.go
@@ -14,27 +14,27 @@ type UsageOperationPredicate struct {
 
 func (p UsageOperationPredicate) Matches(input Usage) bool {
 
-	if p.CurrentValue != nil && (input.CurrentValue == nil && *p.CurrentValue != *input.CurrentValue) {
+	if p.CurrentValue != nil && (input.CurrentValue == nil || *p.CurrentValue != *input.CurrentValue) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
-	if p.RequestedLimit != nil && (input.RequestedLimit == nil && *p.RequestedLimit != *input.RequestedLimit) {
+	if p.RequestedLimit != nil && (input.RequestedLimit == nil || *p.RequestedLimit != *input.RequestedLimit) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
-	if p.Unit != nil && (input.Unit == nil && *p.Unit != *input.Unit) {
+	if p.Unit != nil && (input.Unit == nil || *p.Unit != *input.Unit) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/backupshorttermretentionpolicies/predicates.go b/resource-manager/sql/2021-02-01-preview/backupshorttermretentionpolicies/predicates.go
index 81069096f59..27cabb2785c 100644
--- a/resource-manager/sql/2021-02-01-preview/backupshorttermretentionpolicies/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/backupshorttermretentionpolicies/predicates.go
@@ -11,15 +11,15 @@ type BackupShortTermRetentionPolicyOperationPredicate struct {
 
 func (p BackupShortTermRetentionPolicyOperationPredicate) Matches(input BackupShortTermRetentionPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/blobauditing/predicates.go b/resource-manager/sql/2021-02-01-preview/blobauditing/predicates.go
index 7dc2c7bce7c..0515898ea7f 100644
--- a/resource-manager/sql/2021-02-01-preview/blobauditing/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/blobauditing/predicates.go
@@ -12,19 +12,19 @@ type DatabaseBlobAuditingPolicyOperationPredicate struct {
 
 func (p DatabaseBlobAuditingPolicyOperationPredicate) Matches(input DatabaseBlobAuditingPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -39,15 +39,15 @@ type ExtendedDatabaseBlobAuditingPolicyOperationPredicate struct {
 
 func (p ExtendedDatabaseBlobAuditingPolicyOperationPredicate) Matches(input ExtendedDatabaseBlobAuditingPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -62,15 +62,15 @@ type ExtendedServerBlobAuditingPolicyOperationPredicate struct {
 
 func (p ExtendedServerBlobAuditingPolicyOperationPredicate) Matches(input ExtendedServerBlobAuditingPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -85,15 +85,15 @@ type ServerBlobAuditingPolicyOperationPredicate struct {
 
 func (p ServerBlobAuditingPolicyOperationPredicate) Matches(input ServerBlobAuditingPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/databasecolumns/predicates.go b/resource-manager/sql/2021-02-01-preview/databasecolumns/predicates.go
index 5399b99c15e..bf9217e6d48 100644
--- a/resource-manager/sql/2021-02-01-preview/databasecolumns/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/databasecolumns/predicates.go
@@ -11,15 +11,15 @@ type DatabaseColumnOperationPredicate struct {
 
 func (p DatabaseColumnOperationPredicate) Matches(input DatabaseColumn) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/databaseextensions/predicates.go b/resource-manager/sql/2021-02-01-preview/databaseextensions/predicates.go
index 0d48d0c2954..d2668f629aa 100644
--- a/resource-manager/sql/2021-02-01-preview/databaseextensions/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/databaseextensions/predicates.go
@@ -11,15 +11,15 @@ type ImportExportExtensionsOperationResultOperationPredicate struct {
 
 func (p ImportExportExtensionsOperationResultOperationPredicate) Matches(input ImportExportExtensionsOperationResult) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/databaseoperations/predicates.go b/resource-manager/sql/2021-02-01-preview/databaseoperations/predicates.go
index b64feedc5fc..89467769b5b 100644
--- a/resource-manager/sql/2021-02-01-preview/databaseoperations/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/databaseoperations/predicates.go
@@ -11,15 +11,15 @@ type DatabaseOperationOperationPredicate struct {
 
 func (p DatabaseOperationOperationPredicate) Matches(input DatabaseOperation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/databases/predicates.go b/resource-manager/sql/2021-02-01-preview/databases/predicates.go
index 29cb2fcff2f..4f005cd2158 100644
--- a/resource-manager/sql/2021-02-01-preview/databases/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/databases/predicates.go
@@ -14,11 +14,11 @@ type DatabaseOperationPredicate struct {
 
 func (p DatabaseOperationPredicate) Matches(input Database) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -26,15 +26,15 @@ func (p DatabaseOperationPredicate) Matches(input Database) bool {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/databaseschemas/predicates.go b/resource-manager/sql/2021-02-01-preview/databaseschemas/predicates.go
index 01f468ac37b..641b6fac20c 100644
--- a/resource-manager/sql/2021-02-01-preview/databaseschemas/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/databaseschemas/predicates.go
@@ -11,15 +11,15 @@ type ResourceOperationPredicate struct {
 
 func (p ResourceOperationPredicate) Matches(input Resource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/databasesecurityalertpolicies/predicates.go b/resource-manager/sql/2021-02-01-preview/databasesecurityalertpolicies/predicates.go
index 3e29fea7e5a..e1a8e1f4274 100644
--- a/resource-manager/sql/2021-02-01-preview/databasesecurityalertpolicies/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/databasesecurityalertpolicies/predicates.go
@@ -11,15 +11,15 @@ type DatabaseSecurityAlertPolicyOperationPredicate struct {
 
 func (p DatabaseSecurityAlertPolicyOperationPredicate) Matches(input DatabaseSecurityAlertPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/databasetables/predicates.go b/resource-manager/sql/2021-02-01-preview/databasetables/predicates.go
index 9b2488e4fdf..2c942a576ba 100644
--- a/resource-manager/sql/2021-02-01-preview/databasetables/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/databasetables/predicates.go
@@ -11,15 +11,15 @@ type DatabaseTableOperationPredicate struct {
 
 func (p DatabaseTableOperationPredicate) Matches(input DatabaseTable) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/databaseusages/predicates.go b/resource-manager/sql/2021-02-01-preview/databaseusages/predicates.go
index 1dfb88852c9..0ae433ca19e 100644
--- a/resource-manager/sql/2021-02-01-preview/databaseusages/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/databaseusages/predicates.go
@@ -11,15 +11,15 @@ type DatabaseUsageOperationPredicate struct {
 
 func (p DatabaseUsageOperationPredicate) Matches(input DatabaseUsage) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/databasevulnerabilityassessments/predicates.go b/resource-manager/sql/2021-02-01-preview/databasevulnerabilityassessments/predicates.go
index a3e5cfec486..4f0c37586c8 100644
--- a/resource-manager/sql/2021-02-01-preview/databasevulnerabilityassessments/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/databasevulnerabilityassessments/predicates.go
@@ -11,15 +11,15 @@ type DatabaseVulnerabilityAssessmentOperationPredicate struct {
 
 func (p DatabaseVulnerabilityAssessmentOperationPredicate) Matches(input DatabaseVulnerabilityAssessment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/databasevulnerabilityassessmentscans/predicates.go b/resource-manager/sql/2021-02-01-preview/databasevulnerabilityassessmentscans/predicates.go
index 6279a0b9124..5794f6e1b2c 100644
--- a/resource-manager/sql/2021-02-01-preview/databasevulnerabilityassessmentscans/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/databasevulnerabilityassessmentscans/predicates.go
@@ -11,15 +11,15 @@ type VulnerabilityAssessmentScanRecordOperationPredicate struct {
 
 func (p VulnerabilityAssessmentScanRecordOperationPredicate) Matches(input VulnerabilityAssessmentScanRecord) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/datawarehouseuseractivities/predicates.go b/resource-manager/sql/2021-02-01-preview/datawarehouseuseractivities/predicates.go
index 8e8a7b1b161..25dc9b0b353 100644
--- a/resource-manager/sql/2021-02-01-preview/datawarehouseuseractivities/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/datawarehouseuseractivities/predicates.go
@@ -11,15 +11,15 @@ type DataWarehouseUserActivitiesOperationPredicate struct {
 
 func (p DataWarehouseUserActivitiesOperationPredicate) Matches(input DataWarehouseUserActivities) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/deletedservers/predicates.go b/resource-manager/sql/2021-02-01-preview/deletedservers/predicates.go
index 971ce135e3b..9f570a85ad9 100644
--- a/resource-manager/sql/2021-02-01-preview/deletedservers/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/deletedservers/predicates.go
@@ -11,15 +11,15 @@ type DeletedServerOperationPredicate struct {
 
 func (p DeletedServerOperationPredicate) Matches(input DeletedServer) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/elasticpooloperations/predicates.go b/resource-manager/sql/2021-02-01-preview/elasticpooloperations/predicates.go
index a700cce7d65..2ac5a815355 100644
--- a/resource-manager/sql/2021-02-01-preview/elasticpooloperations/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/elasticpooloperations/predicates.go
@@ -11,15 +11,15 @@ type ElasticPoolOperationOperationPredicate struct {
 
 func (p ElasticPoolOperationOperationPredicate) Matches(input ElasticPoolOperation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/elasticpools/predicates.go b/resource-manager/sql/2021-02-01-preview/elasticpools/predicates.go
index 51a2bb1b817..baa6c2c92d7 100644
--- a/resource-manager/sql/2021-02-01-preview/elasticpools/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/elasticpools/predicates.go
@@ -13,11 +13,11 @@ type ElasticPoolOperationPredicate struct {
 
 func (p ElasticPoolOperationPredicate) Matches(input ElasticPool) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p ElasticPoolOperationPredicate) Matches(input ElasticPool) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/encryptionprotectors/predicates.go b/resource-manager/sql/2021-02-01-preview/encryptionprotectors/predicates.go
index 42b2b65d240..8ccad2732fb 100644
--- a/resource-manager/sql/2021-02-01-preview/encryptionprotectors/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/encryptionprotectors/predicates.go
@@ -13,23 +13,23 @@ type EncryptionProtectorOperationPredicate struct {
 
 func (p EncryptionProtectorOperationPredicate) Matches(input EncryptionProtector) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/failovergroups/predicates.go b/resource-manager/sql/2021-02-01-preview/failovergroups/predicates.go
index f63d2c1ef87..bba27fb4d10 100644
--- a/resource-manager/sql/2021-02-01-preview/failovergroups/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/failovergroups/predicates.go
@@ -12,19 +12,19 @@ type FailoverGroupOperationPredicate struct {
 
 func (p FailoverGroupOperationPredicate) Matches(input FailoverGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/firewallrules/predicates.go b/resource-manager/sql/2021-02-01-preview/firewallrules/predicates.go
index 1c6d22830c2..fb7011b1d3b 100644
--- a/resource-manager/sql/2021-02-01-preview/firewallrules/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/firewallrules/predicates.go
@@ -11,15 +11,15 @@ type FirewallRuleOperationPredicate struct {
 
 func (p FirewallRuleOperationPredicate) Matches(input FirewallRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/instancefailovergroups/predicates.go b/resource-manager/sql/2021-02-01-preview/instancefailovergroups/predicates.go
index f4870cb6892..bc1705b3dc4 100644
--- a/resource-manager/sql/2021-02-01-preview/instancefailovergroups/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/instancefailovergroups/predicates.go
@@ -11,15 +11,15 @@ type InstanceFailoverGroupOperationPredicate struct {
 
 func (p InstanceFailoverGroupOperationPredicate) Matches(input InstanceFailoverGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/instancepools/predicates.go b/resource-manager/sql/2021-02-01-preview/instancepools/predicates.go
index a569d211c2a..65903be2cc9 100644
--- a/resource-manager/sql/2021-02-01-preview/instancepools/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/instancepools/predicates.go
@@ -12,7 +12,7 @@ type InstancePoolOperationPredicate struct {
 
 func (p InstancePoolOperationPredicate) Matches(input InstancePool) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p InstancePoolOperationPredicate) Matches(input InstancePool) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/jobagents/predicates.go b/resource-manager/sql/2021-02-01-preview/jobagents/predicates.go
index 9af5edc96d3..0813f84a604 100644
--- a/resource-manager/sql/2021-02-01-preview/jobagents/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/jobagents/predicates.go
@@ -12,7 +12,7 @@ type JobAgentOperationPredicate struct {
 
 func (p JobAgentOperationPredicate) Matches(input JobAgent) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p JobAgentOperationPredicate) Matches(input JobAgent) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/jobcredentials/predicates.go b/resource-manager/sql/2021-02-01-preview/jobcredentials/predicates.go
index 3f5f9058d24..2aa2ac84e10 100644
--- a/resource-manager/sql/2021-02-01-preview/jobcredentials/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/jobcredentials/predicates.go
@@ -11,15 +11,15 @@ type JobCredentialOperationPredicate struct {
 
 func (p JobCredentialOperationPredicate) Matches(input JobCredential) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/jobexecutions/predicates.go b/resource-manager/sql/2021-02-01-preview/jobexecutions/predicates.go
index f216fc9c956..0f0cadef69d 100644
--- a/resource-manager/sql/2021-02-01-preview/jobexecutions/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/jobexecutions/predicates.go
@@ -11,15 +11,15 @@ type JobExecutionOperationPredicate struct {
 
 func (p JobExecutionOperationPredicate) Matches(input JobExecution) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/jobs/predicates.go b/resource-manager/sql/2021-02-01-preview/jobs/predicates.go
index 1722360a161..8326102dc52 100644
--- a/resource-manager/sql/2021-02-01-preview/jobs/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/jobs/predicates.go
@@ -11,15 +11,15 @@ type JobOperationPredicate struct {
 
 func (p JobOperationPredicate) Matches(input Job) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/jobstepexecutions/predicates.go b/resource-manager/sql/2021-02-01-preview/jobstepexecutions/predicates.go
index 620a69e91f0..9108f574a01 100644
--- a/resource-manager/sql/2021-02-01-preview/jobstepexecutions/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/jobstepexecutions/predicates.go
@@ -11,15 +11,15 @@ type JobExecutionOperationPredicate struct {
 
 func (p JobExecutionOperationPredicate) Matches(input JobExecution) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/jobsteps/predicates.go b/resource-manager/sql/2021-02-01-preview/jobsteps/predicates.go
index 0fd7a59f895..2011b5d8053 100644
--- a/resource-manager/sql/2021-02-01-preview/jobsteps/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/jobsteps/predicates.go
@@ -11,15 +11,15 @@ type JobStepOperationPredicate struct {
 
 func (p JobStepOperationPredicate) Matches(input JobStep) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/jobtargetexecutions/predicates.go b/resource-manager/sql/2021-02-01-preview/jobtargetexecutions/predicates.go
index d1c18ba9641..b2a71b3428f 100644
--- a/resource-manager/sql/2021-02-01-preview/jobtargetexecutions/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/jobtargetexecutions/predicates.go
@@ -11,15 +11,15 @@ type JobExecutionOperationPredicate struct {
 
 func (p JobExecutionOperationPredicate) Matches(input JobExecution) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/jobtargetgroups/predicates.go b/resource-manager/sql/2021-02-01-preview/jobtargetgroups/predicates.go
index 4707c2b9c81..b3389a0f643 100644
--- a/resource-manager/sql/2021-02-01-preview/jobtargetgroups/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/jobtargetgroups/predicates.go
@@ -11,15 +11,15 @@ type JobTargetGroupOperationPredicate struct {
 
 func (p JobTargetGroupOperationPredicate) Matches(input JobTargetGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/jobversions/predicates.go b/resource-manager/sql/2021-02-01-preview/jobversions/predicates.go
index 96f71f298aa..c1092c878ce 100644
--- a/resource-manager/sql/2021-02-01-preview/jobversions/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/jobversions/predicates.go
@@ -11,15 +11,15 @@ type ResourceOperationPredicate struct {
 
 func (p ResourceOperationPredicate) Matches(input Resource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/ledgerdigestuploads/predicates.go b/resource-manager/sql/2021-02-01-preview/ledgerdigestuploads/predicates.go
index 4d7bcf8da56..bf2a2ba00b9 100644
--- a/resource-manager/sql/2021-02-01-preview/ledgerdigestuploads/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/ledgerdigestuploads/predicates.go
@@ -11,15 +11,15 @@ type LedgerDigestUploadsOperationPredicate struct {
 
 func (p LedgerDigestUploadsOperationPredicate) Matches(input LedgerDigestUploads) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/longtermretentionbackups/predicates.go b/resource-manager/sql/2021-02-01-preview/longtermretentionbackups/predicates.go
index 15f967d0f4e..3f2817fce24 100644
--- a/resource-manager/sql/2021-02-01-preview/longtermretentionbackups/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/longtermretentionbackups/predicates.go
@@ -11,15 +11,15 @@ type LongTermRetentionBackupOperationPredicate struct {
 
 func (p LongTermRetentionBackupOperationPredicate) Matches(input LongTermRetentionBackup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/longtermretentionmanagedinstancebackups/predicates.go b/resource-manager/sql/2021-02-01-preview/longtermretentionmanagedinstancebackups/predicates.go
index 5a23e86392f..0110d8aa257 100644
--- a/resource-manager/sql/2021-02-01-preview/longtermretentionmanagedinstancebackups/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/longtermretentionmanagedinstancebackups/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstanceLongTermRetentionBackupOperationPredicate struct {
 
 func (p ManagedInstanceLongTermRetentionBackupOperationPredicate) Matches(input ManagedInstanceLongTermRetentionBackup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/longtermretentionpolicies/predicates.go b/resource-manager/sql/2021-02-01-preview/longtermretentionpolicies/predicates.go
index acf4cf72abf..66b4b6c12ed 100644
--- a/resource-manager/sql/2021-02-01-preview/longtermretentionpolicies/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/longtermretentionpolicies/predicates.go
@@ -11,15 +11,15 @@ type LongTermRetentionPolicyOperationPredicate struct {
 
 func (p LongTermRetentionPolicyOperationPredicate) Matches(input LongTermRetentionPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/managedbackupshorttermretentionpolicies/predicates.go b/resource-manager/sql/2021-02-01-preview/managedbackupshorttermretentionpolicies/predicates.go
index 310454c4447..fb75828a875 100644
--- a/resource-manager/sql/2021-02-01-preview/managedbackupshorttermretentionpolicies/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/managedbackupshorttermretentionpolicies/predicates.go
@@ -11,15 +11,15 @@ type ManagedBackupShortTermRetentionPolicyOperationPredicate struct {
 
 func (p ManagedBackupShortTermRetentionPolicyOperationPredicate) Matches(input ManagedBackupShortTermRetentionPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/manageddatabasecolumns/predicates.go b/resource-manager/sql/2021-02-01-preview/manageddatabasecolumns/predicates.go
index 4cf823a4f1f..e10d2347ca2 100644
--- a/resource-manager/sql/2021-02-01-preview/manageddatabasecolumns/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/manageddatabasecolumns/predicates.go
@@ -11,15 +11,15 @@ type DatabaseColumnOperationPredicate struct {
 
 func (p DatabaseColumnOperationPredicate) Matches(input DatabaseColumn) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/manageddatabasequeries/predicates.go b/resource-manager/sql/2021-02-01-preview/manageddatabasequeries/predicates.go
index 1858c9e53b0..e8225eeda46 100644
--- a/resource-manager/sql/2021-02-01-preview/manageddatabasequeries/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/manageddatabasequeries/predicates.go
@@ -11,15 +11,15 @@ type QueryStatisticsOperationPredicate struct {
 
 func (p QueryStatisticsOperationPredicate) Matches(input QueryStatistics) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/manageddatabases/predicates.go b/resource-manager/sql/2021-02-01-preview/manageddatabases/predicates.go
index 66c91b2a27b..3841529c83e 100644
--- a/resource-manager/sql/2021-02-01-preview/manageddatabases/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/manageddatabases/predicates.go
@@ -12,7 +12,7 @@ type ManagedDatabaseOperationPredicate struct {
 
 func (p ManagedDatabaseOperationPredicate) Matches(input ManagedDatabase) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ManagedDatabaseOperationPredicate) Matches(input ManagedDatabase) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/manageddatabaseschemas/predicates.go b/resource-manager/sql/2021-02-01-preview/manageddatabaseschemas/predicates.go
index 75bf2561c0f..92d0b757757 100644
--- a/resource-manager/sql/2021-02-01-preview/manageddatabaseschemas/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/manageddatabaseschemas/predicates.go
@@ -11,15 +11,15 @@ type ResourceOperationPredicate struct {
 
 func (p ResourceOperationPredicate) Matches(input Resource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/manageddatabasesecurityalertpolicies/predicates.go b/resource-manager/sql/2021-02-01-preview/manageddatabasesecurityalertpolicies/predicates.go
index 4c8f2abc9ee..8cce85428fa 100644
--- a/resource-manager/sql/2021-02-01-preview/manageddatabasesecurityalertpolicies/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/manageddatabasesecurityalertpolicies/predicates.go
@@ -11,15 +11,15 @@ type ManagedDatabaseSecurityAlertPolicyOperationPredicate struct {
 
 func (p ManagedDatabaseSecurityAlertPolicyOperationPredicate) Matches(input ManagedDatabaseSecurityAlertPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/manageddatabasesecurityevents/predicates.go b/resource-manager/sql/2021-02-01-preview/manageddatabasesecurityevents/predicates.go
index 1c1d650ea21..245970161e1 100644
--- a/resource-manager/sql/2021-02-01-preview/manageddatabasesecurityevents/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/manageddatabasesecurityevents/predicates.go
@@ -11,15 +11,15 @@ type SecurityEventOperationPredicate struct {
 
 func (p SecurityEventOperationPredicate) Matches(input SecurityEvent) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/manageddatabasesensitivitylabels/predicates.go b/resource-manager/sql/2021-02-01-preview/manageddatabasesensitivitylabels/predicates.go
index eda14b7d9b0..12545dcc919 100644
--- a/resource-manager/sql/2021-02-01-preview/manageddatabasesensitivitylabels/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/manageddatabasesensitivitylabels/predicates.go
@@ -12,19 +12,19 @@ type SensitivityLabelOperationPredicate struct {
 
 func (p SensitivityLabelOperationPredicate) Matches(input SensitivityLabel) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/manageddatabasetables/predicates.go b/resource-manager/sql/2021-02-01-preview/manageddatabasetables/predicates.go
index 6cd4587fc3b..e9eb18274d2 100644
--- a/resource-manager/sql/2021-02-01-preview/manageddatabasetables/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/manageddatabasetables/predicates.go
@@ -11,15 +11,15 @@ type DatabaseTableOperationPredicate struct {
 
 func (p DatabaseTableOperationPredicate) Matches(input DatabaseTable) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/manageddatabasetransparentdataencryption/predicates.go b/resource-manager/sql/2021-02-01-preview/manageddatabasetransparentdataencryption/predicates.go
index 4ec7c6171bc..18ed9b33301 100644
--- a/resource-manager/sql/2021-02-01-preview/manageddatabasetransparentdataencryption/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/manageddatabasetransparentdataencryption/predicates.go
@@ -11,15 +11,15 @@ type ManagedTransparentDataEncryptionOperationPredicate struct {
 
 func (p ManagedTransparentDataEncryptionOperationPredicate) Matches(input ManagedTransparentDataEncryption) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/manageddatabasevulnerabilityassessments/predicates.go b/resource-manager/sql/2021-02-01-preview/manageddatabasevulnerabilityassessments/predicates.go
index d628429b37f..5254e2baffc 100644
--- a/resource-manager/sql/2021-02-01-preview/manageddatabasevulnerabilityassessments/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/manageddatabasevulnerabilityassessments/predicates.go
@@ -11,15 +11,15 @@ type DatabaseVulnerabilityAssessmentOperationPredicate struct {
 
 func (p DatabaseVulnerabilityAssessmentOperationPredicate) Matches(input DatabaseVulnerabilityAssessment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/manageddatabasevulnerabilityassessmentscans/predicates.go b/resource-manager/sql/2021-02-01-preview/manageddatabasevulnerabilityassessmentscans/predicates.go
index 5b1cd5058d0..5f80e6070ce 100644
--- a/resource-manager/sql/2021-02-01-preview/manageddatabasevulnerabilityassessmentscans/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/manageddatabasevulnerabilityassessmentscans/predicates.go
@@ -11,15 +11,15 @@ type VulnerabilityAssessmentScanRecordOperationPredicate struct {
 
 func (p VulnerabilityAssessmentScanRecordOperationPredicate) Matches(input VulnerabilityAssessmentScanRecord) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/managedinstanceadministrators/predicates.go b/resource-manager/sql/2021-02-01-preview/managedinstanceadministrators/predicates.go
index 1e4aff885cf..d8dcbcc98be 100644
--- a/resource-manager/sql/2021-02-01-preview/managedinstanceadministrators/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/managedinstanceadministrators/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstanceAdministratorOperationPredicate struct {
 
 func (p ManagedInstanceAdministratorOperationPredicate) Matches(input ManagedInstanceAdministrator) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/managedinstanceazureadonlyauthentications/predicates.go b/resource-manager/sql/2021-02-01-preview/managedinstanceazureadonlyauthentications/predicates.go
index 211a4295e0e..26056826c21 100644
--- a/resource-manager/sql/2021-02-01-preview/managedinstanceazureadonlyauthentications/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/managedinstanceazureadonlyauthentications/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstanceAzureADOnlyAuthenticationOperationPredicate struct {
 
 func (p ManagedInstanceAzureADOnlyAuthenticationOperationPredicate) Matches(input ManagedInstanceAzureADOnlyAuthentication) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/managedinstanceencryptionprotectors/predicates.go b/resource-manager/sql/2021-02-01-preview/managedinstanceencryptionprotectors/predicates.go
index f8be7ee2d4b..3d36552bf7f 100644
--- a/resource-manager/sql/2021-02-01-preview/managedinstanceencryptionprotectors/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/managedinstanceencryptionprotectors/predicates.go
@@ -12,19 +12,19 @@ type ManagedInstanceEncryptionProtectorOperationPredicate struct {
 
 func (p ManagedInstanceEncryptionProtectorOperationPredicate) Matches(input ManagedInstanceEncryptionProtector) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/managedinstancekeys/predicates.go b/resource-manager/sql/2021-02-01-preview/managedinstancekeys/predicates.go
index f7242b611b2..9d02a4bfacd 100644
--- a/resource-manager/sql/2021-02-01-preview/managedinstancekeys/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/managedinstancekeys/predicates.go
@@ -12,19 +12,19 @@ type ManagedInstanceKeyOperationPredicate struct {
 
 func (p ManagedInstanceKeyOperationPredicate) Matches(input ManagedInstanceKey) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/managedinstancelongtermretentionpolicies/predicates.go b/resource-manager/sql/2021-02-01-preview/managedinstancelongtermretentionpolicies/predicates.go
index 596418130f1..8ab8e0bab1f 100644
--- a/resource-manager/sql/2021-02-01-preview/managedinstancelongtermretentionpolicies/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/managedinstancelongtermretentionpolicies/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstanceLongTermRetentionPolicyOperationPredicate struct {
 
 func (p ManagedInstanceLongTermRetentionPolicyOperationPredicate) Matches(input ManagedInstanceLongTermRetentionPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/managedinstanceoperations/predicates.go b/resource-manager/sql/2021-02-01-preview/managedinstanceoperations/predicates.go
index c3c281bd561..58a7ff1293e 100644
--- a/resource-manager/sql/2021-02-01-preview/managedinstanceoperations/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/managedinstanceoperations/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstanceOperationOperationPredicate struct {
 
 func (p ManagedInstanceOperationOperationPredicate) Matches(input ManagedInstanceOperation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/managedinstanceprivateendpointconnections/predicates.go b/resource-manager/sql/2021-02-01-preview/managedinstanceprivateendpointconnections/predicates.go
index 73846575128..9487375b565 100644
--- a/resource-manager/sql/2021-02-01-preview/managedinstanceprivateendpointconnections/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/managedinstanceprivateendpointconnections/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstancePrivateEndpointConnectionOperationPredicate struct {
 
 func (p ManagedInstancePrivateEndpointConnectionOperationPredicate) Matches(input ManagedInstancePrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/managedinstanceprivatelinkresources/predicates.go b/resource-manager/sql/2021-02-01-preview/managedinstanceprivatelinkresources/predicates.go
index 0e780f2f02f..f17642eb3dc 100644
--- a/resource-manager/sql/2021-02-01-preview/managedinstanceprivatelinkresources/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/managedinstanceprivatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstancePrivateLinkOperationPredicate struct {
 
 func (p ManagedInstancePrivateLinkOperationPredicate) Matches(input ManagedInstancePrivateLink) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/managedinstances/predicates.go b/resource-manager/sql/2021-02-01-preview/managedinstances/predicates.go
index 3930758ef14..63bfd811b3d 100644
--- a/resource-manager/sql/2021-02-01-preview/managedinstances/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/managedinstances/predicates.go
@@ -12,7 +12,7 @@ type ManagedInstanceOperationPredicate struct {
 
 func (p ManagedInstanceOperationPredicate) Matches(input ManagedInstance) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ManagedInstanceOperationPredicate) Matches(input ManagedInstance) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -41,23 +41,23 @@ type TopQueriesOperationPredicate struct {
 
 func (p TopQueriesOperationPredicate) Matches(input TopQueries) bool {
 
-	if p.AggregationFunction != nil && (input.AggregationFunction == nil && *p.AggregationFunction != *input.AggregationFunction) {
+	if p.AggregationFunction != nil && (input.AggregationFunction == nil || *p.AggregationFunction != *input.AggregationFunction) {
 		return false
 	}
 
-	if p.EndTime != nil && (input.EndTime == nil && *p.EndTime != *input.EndTime) {
+	if p.EndTime != nil && (input.EndTime == nil || *p.EndTime != *input.EndTime) {
 		return false
 	}
 
-	if p.NumberOfQueries != nil && (input.NumberOfQueries == nil && *p.NumberOfQueries != *input.NumberOfQueries) {
+	if p.NumberOfQueries != nil && (input.NumberOfQueries == nil || *p.NumberOfQueries != *input.NumberOfQueries) {
 		return false
 	}
 
-	if p.ObservationMetric != nil && (input.ObservationMetric == nil && *p.ObservationMetric != *input.ObservationMetric) {
+	if p.ObservationMetric != nil && (input.ObservationMetric == nil || *p.ObservationMetric != *input.ObservationMetric) {
 		return false
 	}
 
-	if p.StartTime != nil && (input.StartTime == nil && *p.StartTime != *input.StartTime) {
+	if p.StartTime != nil && (input.StartTime == nil || *p.StartTime != *input.StartTime) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/managedinstancevulnerabilityassessments/predicates.go b/resource-manager/sql/2021-02-01-preview/managedinstancevulnerabilityassessments/predicates.go
index 14b00fe56b2..74c244d5479 100644
--- a/resource-manager/sql/2021-02-01-preview/managedinstancevulnerabilityassessments/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/managedinstancevulnerabilityassessments/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstanceVulnerabilityAssessmentOperationPredicate struct {
 
 func (p ManagedInstanceVulnerabilityAssessmentOperationPredicate) Matches(input ManagedInstanceVulnerabilityAssessment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/managedrestorabledroppeddatabasebackupshorttermretentionpolicies/predicates.go b/resource-manager/sql/2021-02-01-preview/managedrestorabledroppeddatabasebackupshorttermretentionpolicies/predicates.go
index 0c7af11d4d5..c6890ca1ddf 100644
--- a/resource-manager/sql/2021-02-01-preview/managedrestorabledroppeddatabasebackupshorttermretentionpolicies/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/managedrestorabledroppeddatabasebackupshorttermretentionpolicies/predicates.go
@@ -11,15 +11,15 @@ type ManagedBackupShortTermRetentionPolicyOperationPredicate struct {
 
 func (p ManagedBackupShortTermRetentionPolicyOperationPredicate) Matches(input ManagedBackupShortTermRetentionPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/managedserversecurityalertpolicies/predicates.go b/resource-manager/sql/2021-02-01-preview/managedserversecurityalertpolicies/predicates.go
index 83e1986a11b..c7d46c58a0f 100644
--- a/resource-manager/sql/2021-02-01-preview/managedserversecurityalertpolicies/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/managedserversecurityalertpolicies/predicates.go
@@ -11,15 +11,15 @@ type ManagedServerSecurityAlertPolicyOperationPredicate struct {
 
 func (p ManagedServerSecurityAlertPolicyOperationPredicate) Matches(input ManagedServerSecurityAlertPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/outboundfirewallrules/predicates.go b/resource-manager/sql/2021-02-01-preview/outboundfirewallrules/predicates.go
index 1d47a879f9a..9d87029d13c 100644
--- a/resource-manager/sql/2021-02-01-preview/outboundfirewallrules/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/outboundfirewallrules/predicates.go
@@ -11,15 +11,15 @@ type OutboundFirewallRuleOperationPredicate struct {
 
 func (p OutboundFirewallRuleOperationPredicate) Matches(input OutboundFirewallRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/privateendpointconnections/predicates.go b/resource-manager/sql/2021-02-01-preview/privateendpointconnections/predicates.go
index bea3f66b397..4a03a91ce52 100644
--- a/resource-manager/sql/2021-02-01-preview/privateendpointconnections/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/privateendpointconnections/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/privatelinkresources/predicates.go b/resource-manager/sql/2021-02-01-preview/privatelinkresources/predicates.go
index 29d787f073a..19b771c3994 100644
--- a/resource-manager/sql/2021-02-01-preview/privatelinkresources/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/privatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/recoverablemanageddatabases/predicates.go b/resource-manager/sql/2021-02-01-preview/recoverablemanageddatabases/predicates.go
index 7b6f76bac6e..e7c04e344c3 100644
--- a/resource-manager/sql/2021-02-01-preview/recoverablemanageddatabases/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/recoverablemanageddatabases/predicates.go
@@ -11,15 +11,15 @@ type RecoverableManagedDatabaseOperationPredicate struct {
 
 func (p RecoverableManagedDatabaseOperationPredicate) Matches(input RecoverableManagedDatabase) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/replicationlinks/predicates.go b/resource-manager/sql/2021-02-01-preview/replicationlinks/predicates.go
index 03eccc3aa3b..d148d45bd2b 100644
--- a/resource-manager/sql/2021-02-01-preview/replicationlinks/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/replicationlinks/predicates.go
@@ -11,15 +11,15 @@ type ReplicationLinkOperationPredicate struct {
 
 func (p ReplicationLinkOperationPredicate) Matches(input ReplicationLink) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/restorabledroppeddatabases/predicates.go b/resource-manager/sql/2021-02-01-preview/restorabledroppeddatabases/predicates.go
index 74f2093eeef..539816771bc 100644
--- a/resource-manager/sql/2021-02-01-preview/restorabledroppeddatabases/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/restorabledroppeddatabases/predicates.go
@@ -12,19 +12,19 @@ type RestorableDroppedDatabaseOperationPredicate struct {
 
 func (p RestorableDroppedDatabaseOperationPredicate) Matches(input RestorableDroppedDatabase) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/restorabledroppedmanageddatabases/predicates.go b/resource-manager/sql/2021-02-01-preview/restorabledroppedmanageddatabases/predicates.go
index 02b9f5cb1ba..4ccec82b5ad 100644
--- a/resource-manager/sql/2021-02-01-preview/restorabledroppedmanageddatabases/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/restorabledroppedmanageddatabases/predicates.go
@@ -12,7 +12,7 @@ type RestorableDroppedManagedDatabaseOperationPredicate struct {
 
 func (p RestorableDroppedManagedDatabaseOperationPredicate) Matches(input RestorableDroppedManagedDatabase) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p RestorableDroppedManagedDatabaseOperationPredicate) Matches(input Restor
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/restorepoints/predicates.go b/resource-manager/sql/2021-02-01-preview/restorepoints/predicates.go
index 4c0eba23f55..163b30b8206 100644
--- a/resource-manager/sql/2021-02-01-preview/restorepoints/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/restorepoints/predicates.go
@@ -12,19 +12,19 @@ type RestorePointOperationPredicate struct {
 
 func (p RestorePointOperationPredicate) Matches(input RestorePoint) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/sensitivitylabels/predicates.go b/resource-manager/sql/2021-02-01-preview/sensitivitylabels/predicates.go
index 832a5ff4413..c3026932143 100644
--- a/resource-manager/sql/2021-02-01-preview/sensitivitylabels/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/sensitivitylabels/predicates.go
@@ -12,19 +12,19 @@ type SensitivityLabelOperationPredicate struct {
 
 func (p SensitivityLabelOperationPredicate) Matches(input SensitivityLabel) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/serverazureadadministrators/predicates.go b/resource-manager/sql/2021-02-01-preview/serverazureadadministrators/predicates.go
index 071f416faf3..8049433d6c4 100644
--- a/resource-manager/sql/2021-02-01-preview/serverazureadadministrators/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/serverazureadadministrators/predicates.go
@@ -11,15 +11,15 @@ type ServerAzureADAdministratorOperationPredicate struct {
 
 func (p ServerAzureADAdministratorOperationPredicate) Matches(input ServerAzureADAdministrator) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/serverazureadonlyauthentications/predicates.go b/resource-manager/sql/2021-02-01-preview/serverazureadonlyauthentications/predicates.go
index a0e05a12e7b..fa774ebe409 100644
--- a/resource-manager/sql/2021-02-01-preview/serverazureadonlyauthentications/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/serverazureadonlyauthentications/predicates.go
@@ -11,15 +11,15 @@ type ServerAzureADOnlyAuthenticationOperationPredicate struct {
 
 func (p ServerAzureADOnlyAuthenticationOperationPredicate) Matches(input ServerAzureADOnlyAuthentication) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/serverdevopsaudit/predicates.go b/resource-manager/sql/2021-02-01-preview/serverdevopsaudit/predicates.go
index d65ddae23ff..249e3853d29 100644
--- a/resource-manager/sql/2021-02-01-preview/serverdevopsaudit/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/serverdevopsaudit/predicates.go
@@ -11,15 +11,15 @@ type ServerDevOpsAuditingSettingsOperationPredicate struct {
 
 func (p ServerDevOpsAuditingSettingsOperationPredicate) Matches(input ServerDevOpsAuditingSettings) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/serverdnsaliases/predicates.go b/resource-manager/sql/2021-02-01-preview/serverdnsaliases/predicates.go
index dd46ec9f297..964f164db6c 100644
--- a/resource-manager/sql/2021-02-01-preview/serverdnsaliases/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/serverdnsaliases/predicates.go
@@ -11,15 +11,15 @@ type ServerDnsAliasOperationPredicate struct {
 
 func (p ServerDnsAliasOperationPredicate) Matches(input ServerDnsAlias) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/serverkeys/predicates.go b/resource-manager/sql/2021-02-01-preview/serverkeys/predicates.go
index f06083326c5..e0882f7257e 100644
--- a/resource-manager/sql/2021-02-01-preview/serverkeys/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/serverkeys/predicates.go
@@ -13,23 +13,23 @@ type ServerKeyOperationPredicate struct {
 
 func (p ServerKeyOperationPredicate) Matches(input ServerKey) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/serveroperations/predicates.go b/resource-manager/sql/2021-02-01-preview/serveroperations/predicates.go
index 780fc572342..c23369f7156 100644
--- a/resource-manager/sql/2021-02-01-preview/serveroperations/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/serveroperations/predicates.go
@@ -11,15 +11,15 @@ type ServerOperationOperationPredicate struct {
 
 func (p ServerOperationOperationPredicate) Matches(input ServerOperation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/servers/predicates.go b/resource-manager/sql/2021-02-01-preview/servers/predicates.go
index 1c1669056ea..c6dce7be40c 100644
--- a/resource-manager/sql/2021-02-01-preview/servers/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/servers/predicates.go
@@ -13,11 +13,11 @@ type ServerOperationPredicate struct {
 
 func (p ServerOperationPredicate) Matches(input Server) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p ServerOperationPredicate) Matches(input Server) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/serversecurityalertpolicies/predicates.go b/resource-manager/sql/2021-02-01-preview/serversecurityalertpolicies/predicates.go
index ac6768d8eb2..ff213a5f292 100644
--- a/resource-manager/sql/2021-02-01-preview/serversecurityalertpolicies/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/serversecurityalertpolicies/predicates.go
@@ -11,15 +11,15 @@ type ServerSecurityAlertPolicyOperationPredicate struct {
 
 func (p ServerSecurityAlertPolicyOperationPredicate) Matches(input ServerSecurityAlertPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/servertrustgroups/predicates.go b/resource-manager/sql/2021-02-01-preview/servertrustgroups/predicates.go
index 218be5ad42f..92b66b22438 100644
--- a/resource-manager/sql/2021-02-01-preview/servertrustgroups/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/servertrustgroups/predicates.go
@@ -11,15 +11,15 @@ type ServerTrustGroupOperationPredicate struct {
 
 func (p ServerTrustGroupOperationPredicate) Matches(input ServerTrustGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/servervulnerabilityassessments/predicates.go b/resource-manager/sql/2021-02-01-preview/servervulnerabilityassessments/predicates.go
index 6adc538840b..cba9908c5fe 100644
--- a/resource-manager/sql/2021-02-01-preview/servervulnerabilityassessments/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/servervulnerabilityassessments/predicates.go
@@ -11,15 +11,15 @@ type ServerVulnerabilityAssessmentOperationPredicate struct {
 
 func (p ServerVulnerabilityAssessmentOperationPredicate) Matches(input ServerVulnerabilityAssessment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/subscriptionusages/predicates.go b/resource-manager/sql/2021-02-01-preview/subscriptionusages/predicates.go
index 06a043722c0..f47c43bd9ee 100644
--- a/resource-manager/sql/2021-02-01-preview/subscriptionusages/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/subscriptionusages/predicates.go
@@ -11,15 +11,15 @@ type SubscriptionUsageOperationPredicate struct {
 
 func (p SubscriptionUsageOperationPredicate) Matches(input SubscriptionUsage) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/syncagents/predicates.go b/resource-manager/sql/2021-02-01-preview/syncagents/predicates.go
index 0f2b289931f..962878c79f0 100644
--- a/resource-manager/sql/2021-02-01-preview/syncagents/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/syncagents/predicates.go
@@ -11,15 +11,15 @@ type SyncAgentOperationPredicate struct {
 
 func (p SyncAgentOperationPredicate) Matches(input SyncAgent) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type SyncAgentLinkedDatabaseOperationPredicate struct {
 
 func (p SyncAgentLinkedDatabaseOperationPredicate) Matches(input SyncAgentLinkedDatabase) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/syncgroups/predicates.go b/resource-manager/sql/2021-02-01-preview/syncgroups/predicates.go
index 4808f7bc8a8..69e910a85ce 100644
--- a/resource-manager/sql/2021-02-01-preview/syncgroups/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/syncgroups/predicates.go
@@ -9,7 +9,7 @@ type SyncDatabaseIdPropertiesOperationPredicate struct {
 
 func (p SyncDatabaseIdPropertiesOperationPredicate) Matches(input SyncDatabaseIdProperties) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -22,7 +22,7 @@ type SyncFullSchemaPropertiesOperationPredicate struct {
 
 func (p SyncFullSchemaPropertiesOperationPredicate) Matches(input SyncFullSchemaProperties) bool {
 
-	if p.LastUpdateTime != nil && (input.LastUpdateTime == nil && *p.LastUpdateTime != *input.LastUpdateTime) {
+	if p.LastUpdateTime != nil && (input.LastUpdateTime == nil || *p.LastUpdateTime != *input.LastUpdateTime) {
 		return false
 	}
 
@@ -37,15 +37,15 @@ type SyncGroupOperationPredicate struct {
 
 func (p SyncGroupOperationPredicate) Matches(input SyncGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -62,23 +62,23 @@ type SyncGroupLogPropertiesOperationPredicate struct {
 
 func (p SyncGroupLogPropertiesOperationPredicate) Matches(input SyncGroupLogProperties) bool {
 
-	if p.Details != nil && (input.Details == nil && *p.Details != *input.Details) {
+	if p.Details != nil && (input.Details == nil || *p.Details != *input.Details) {
 		return false
 	}
 
-	if p.OperationStatus != nil && (input.OperationStatus == nil && *p.OperationStatus != *input.OperationStatus) {
+	if p.OperationStatus != nil && (input.OperationStatus == nil || *p.OperationStatus != *input.OperationStatus) {
 		return false
 	}
 
-	if p.Source != nil && (input.Source == nil && *p.Source != *input.Source) {
+	if p.Source != nil && (input.Source == nil || *p.Source != *input.Source) {
 		return false
 	}
 
-	if p.Timestamp != nil && (input.Timestamp == nil && *p.Timestamp != *input.Timestamp) {
+	if p.Timestamp != nil && (input.Timestamp == nil || *p.Timestamp != *input.Timestamp) {
 		return false
 	}
 
-	if p.TracingId != nil && (input.TracingId == nil && *p.TracingId != *input.TracingId) {
+	if p.TracingId != nil && (input.TracingId == nil || *p.TracingId != *input.TracingId) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/syncmembers/predicates.go b/resource-manager/sql/2021-02-01-preview/syncmembers/predicates.go
index 9eada17780d..72491a390dc 100644
--- a/resource-manager/sql/2021-02-01-preview/syncmembers/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/syncmembers/predicates.go
@@ -9,7 +9,7 @@ type SyncFullSchemaPropertiesOperationPredicate struct {
 
 func (p SyncFullSchemaPropertiesOperationPredicate) Matches(input SyncFullSchemaProperties) bool {
 
-	if p.LastUpdateTime != nil && (input.LastUpdateTime == nil && *p.LastUpdateTime != *input.LastUpdateTime) {
+	if p.LastUpdateTime != nil && (input.LastUpdateTime == nil || *p.LastUpdateTime != *input.LastUpdateTime) {
 		return false
 	}
 
@@ -24,15 +24,15 @@ type SyncMemberOperationPredicate struct {
 
 func (p SyncMemberOperationPredicate) Matches(input SyncMember) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/timezones/predicates.go b/resource-manager/sql/2021-02-01-preview/timezones/predicates.go
index 418ea9ec9d5..7fcbdb82752 100644
--- a/resource-manager/sql/2021-02-01-preview/timezones/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/timezones/predicates.go
@@ -11,15 +11,15 @@ type TimeZoneOperationPredicate struct {
 
 func (p TimeZoneOperationPredicate) Matches(input TimeZone) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/transparentdataencryptions/predicates.go b/resource-manager/sql/2021-02-01-preview/transparentdataencryptions/predicates.go
index c17b78369cb..f312872d12a 100644
--- a/resource-manager/sql/2021-02-01-preview/transparentdataencryptions/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/transparentdataencryptions/predicates.go
@@ -11,15 +11,15 @@ type LogicalDatabaseTransparentDataEncryptionOperationPredicate struct {
 
 func (p LogicalDatabaseTransparentDataEncryptionOperationPredicate) Matches(input LogicalDatabaseTransparentDataEncryption) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/usages/predicates.go b/resource-manager/sql/2021-02-01-preview/usages/predicates.go
index bbcaf08d84d..38b0aa9b1f4 100644
--- a/resource-manager/sql/2021-02-01-preview/usages/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/usages/predicates.go
@@ -14,27 +14,27 @@ type UsageOperationPredicate struct {
 
 func (p UsageOperationPredicate) Matches(input Usage) bool {
 
-	if p.CurrentValue != nil && (input.CurrentValue == nil && *p.CurrentValue != *input.CurrentValue) {
+	if p.CurrentValue != nil && (input.CurrentValue == nil || *p.CurrentValue != *input.CurrentValue) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
-	if p.RequestedLimit != nil && (input.RequestedLimit == nil && *p.RequestedLimit != *input.RequestedLimit) {
+	if p.RequestedLimit != nil && (input.RequestedLimit == nil || *p.RequestedLimit != *input.RequestedLimit) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
-	if p.Unit != nil && (input.Unit == nil && *p.Unit != *input.Unit) {
+	if p.Unit != nil && (input.Unit == nil || *p.Unit != *input.Unit) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/virtualclusters/predicates.go b/resource-manager/sql/2021-02-01-preview/virtualclusters/predicates.go
index 79bf074352c..48542d3780f 100644
--- a/resource-manager/sql/2021-02-01-preview/virtualclusters/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/virtualclusters/predicates.go
@@ -12,7 +12,7 @@ type VirtualClusterOperationPredicate struct {
 
 func (p VirtualClusterOperationPredicate) Matches(input VirtualCluster) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p VirtualClusterOperationPredicate) Matches(input VirtualCluster) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/virtualnetworkrules/predicates.go b/resource-manager/sql/2021-02-01-preview/virtualnetworkrules/predicates.go
index 3050c3d8f64..9170201b8d5 100644
--- a/resource-manager/sql/2021-02-01-preview/virtualnetworkrules/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/virtualnetworkrules/predicates.go
@@ -11,15 +11,15 @@ type VirtualNetworkRuleOperationPredicate struct {
 
 func (p VirtualNetworkRuleOperationPredicate) Matches(input VirtualNetworkRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/workloadclassifiers/predicates.go b/resource-manager/sql/2021-02-01-preview/workloadclassifiers/predicates.go
index c3d0dd2850c..9058806d434 100644
--- a/resource-manager/sql/2021-02-01-preview/workloadclassifiers/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/workloadclassifiers/predicates.go
@@ -11,15 +11,15 @@ type WorkloadClassifierOperationPredicate struct {
 
 func (p WorkloadClassifierOperationPredicate) Matches(input WorkloadClassifier) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2021-02-01-preview/workloadgroups/predicates.go b/resource-manager/sql/2021-02-01-preview/workloadgroups/predicates.go
index 5d9574fed44..3fa552a0da7 100644
--- a/resource-manager/sql/2021-02-01-preview/workloadgroups/predicates.go
+++ b/resource-manager/sql/2021-02-01-preview/workloadgroups/predicates.go
@@ -11,15 +11,15 @@ type WorkloadGroupOperationPredicate struct {
 
 func (p WorkloadGroupOperationPredicate) Matches(input WorkloadGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/backupshorttermretentionpolicies/predicates.go b/resource-manager/sql/2022-11-01-preview/backupshorttermretentionpolicies/predicates.go
index 81069096f59..27cabb2785c 100644
--- a/resource-manager/sql/2022-11-01-preview/backupshorttermretentionpolicies/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/backupshorttermretentionpolicies/predicates.go
@@ -11,15 +11,15 @@ type BackupShortTermRetentionPolicyOperationPredicate struct {
 
 func (p BackupShortTermRetentionPolicyOperationPredicate) Matches(input BackupShortTermRetentionPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/blobauditing/predicates.go b/resource-manager/sql/2022-11-01-preview/blobauditing/predicates.go
index 7dc2c7bce7c..0515898ea7f 100644
--- a/resource-manager/sql/2022-11-01-preview/blobauditing/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/blobauditing/predicates.go
@@ -12,19 +12,19 @@ type DatabaseBlobAuditingPolicyOperationPredicate struct {
 
 func (p DatabaseBlobAuditingPolicyOperationPredicate) Matches(input DatabaseBlobAuditingPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -39,15 +39,15 @@ type ExtendedDatabaseBlobAuditingPolicyOperationPredicate struct {
 
 func (p ExtendedDatabaseBlobAuditingPolicyOperationPredicate) Matches(input ExtendedDatabaseBlobAuditingPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -62,15 +62,15 @@ type ExtendedServerBlobAuditingPolicyOperationPredicate struct {
 
 func (p ExtendedServerBlobAuditingPolicyOperationPredicate) Matches(input ExtendedServerBlobAuditingPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -85,15 +85,15 @@ type ServerBlobAuditingPolicyOperationPredicate struct {
 
 func (p ServerBlobAuditingPolicyOperationPredicate) Matches(input ServerBlobAuditingPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/databaseadvancedthreatprotectionsettings/predicates.go b/resource-manager/sql/2022-11-01-preview/databaseadvancedthreatprotectionsettings/predicates.go
index f22fb1be38f..924364c1b59 100644
--- a/resource-manager/sql/2022-11-01-preview/databaseadvancedthreatprotectionsettings/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/databaseadvancedthreatprotectionsettings/predicates.go
@@ -11,15 +11,15 @@ type DatabaseAdvancedThreatProtectionOperationPredicate struct {
 
 func (p DatabaseAdvancedThreatProtectionOperationPredicate) Matches(input DatabaseAdvancedThreatProtection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/databasecolumns/predicates.go b/resource-manager/sql/2022-11-01-preview/databasecolumns/predicates.go
index 5399b99c15e..bf9217e6d48 100644
--- a/resource-manager/sql/2022-11-01-preview/databasecolumns/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/databasecolumns/predicates.go
@@ -11,15 +11,15 @@ type DatabaseColumnOperationPredicate struct {
 
 func (p DatabaseColumnOperationPredicate) Matches(input DatabaseColumn) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/databaseextensions/predicates.go b/resource-manager/sql/2022-11-01-preview/databaseextensions/predicates.go
index 0d48d0c2954..d2668f629aa 100644
--- a/resource-manager/sql/2022-11-01-preview/databaseextensions/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/databaseextensions/predicates.go
@@ -11,15 +11,15 @@ type ImportExportExtensionsOperationResultOperationPredicate struct {
 
 func (p ImportExportExtensionsOperationResultOperationPredicate) Matches(input ImportExportExtensionsOperationResult) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/databaseoperations/predicates.go b/resource-manager/sql/2022-11-01-preview/databaseoperations/predicates.go
index b64feedc5fc..89467769b5b 100644
--- a/resource-manager/sql/2022-11-01-preview/databaseoperations/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/databaseoperations/predicates.go
@@ -11,15 +11,15 @@ type DatabaseOperationOperationPredicate struct {
 
 func (p DatabaseOperationOperationPredicate) Matches(input DatabaseOperation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/databases/predicates.go b/resource-manager/sql/2022-11-01-preview/databases/predicates.go
index 29cb2fcff2f..4f005cd2158 100644
--- a/resource-manager/sql/2022-11-01-preview/databases/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/databases/predicates.go
@@ -14,11 +14,11 @@ type DatabaseOperationPredicate struct {
 
 func (p DatabaseOperationPredicate) Matches(input Database) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -26,15 +26,15 @@ func (p DatabaseOperationPredicate) Matches(input Database) bool {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/databaseschemas/predicates.go b/resource-manager/sql/2022-11-01-preview/databaseschemas/predicates.go
index 01f468ac37b..641b6fac20c 100644
--- a/resource-manager/sql/2022-11-01-preview/databaseschemas/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/databaseschemas/predicates.go
@@ -11,15 +11,15 @@ type ResourceOperationPredicate struct {
 
 func (p ResourceOperationPredicate) Matches(input Resource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/databasesecurityalertpolicies/predicates.go b/resource-manager/sql/2022-11-01-preview/databasesecurityalertpolicies/predicates.go
index 3e29fea7e5a..e1a8e1f4274 100644
--- a/resource-manager/sql/2022-11-01-preview/databasesecurityalertpolicies/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/databasesecurityalertpolicies/predicates.go
@@ -11,15 +11,15 @@ type DatabaseSecurityAlertPolicyOperationPredicate struct {
 
 func (p DatabaseSecurityAlertPolicyOperationPredicate) Matches(input DatabaseSecurityAlertPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/databasesqlvulnerabilityassessmentbaselines/predicates.go b/resource-manager/sql/2022-11-01-preview/databasesqlvulnerabilityassessmentbaselines/predicates.go
index 628ac6c9a06..0ea25284814 100644
--- a/resource-manager/sql/2022-11-01-preview/databasesqlvulnerabilityassessmentbaselines/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/databasesqlvulnerabilityassessmentbaselines/predicates.go
@@ -11,15 +11,15 @@ type DatabaseSqlVulnerabilityAssessmentBaselineSetOperationPredicate struct {
 
 func (p DatabaseSqlVulnerabilityAssessmentBaselineSetOperationPredicate) Matches(input DatabaseSqlVulnerabilityAssessmentBaselineSet) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/databasesqlvulnerabilityassessmentrulebaselines/predicates.go b/resource-manager/sql/2022-11-01-preview/databasesqlvulnerabilityassessmentrulebaselines/predicates.go
index a788e19ddde..50353e789a0 100644
--- a/resource-manager/sql/2022-11-01-preview/databasesqlvulnerabilityassessmentrulebaselines/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/databasesqlvulnerabilityassessmentrulebaselines/predicates.go
@@ -11,15 +11,15 @@ type DatabaseSqlVulnerabilityAssessmentRuleBaselineOperationPredicate struct {
 
 func (p DatabaseSqlVulnerabilityAssessmentRuleBaselineOperationPredicate) Matches(input DatabaseSqlVulnerabilityAssessmentRuleBaseline) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/databasesqlvulnerabilityassessmentscanresult/predicates.go b/resource-manager/sql/2022-11-01-preview/databasesqlvulnerabilityassessmentscanresult/predicates.go
index 90c0ebec57a..83f835443de 100644
--- a/resource-manager/sql/2022-11-01-preview/databasesqlvulnerabilityassessmentscanresult/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/databasesqlvulnerabilityassessmentscanresult/predicates.go
@@ -11,15 +11,15 @@ type SqlVulnerabilityAssessmentScanResultsOperationPredicate struct {
 
 func (p SqlVulnerabilityAssessmentScanResultsOperationPredicate) Matches(input SqlVulnerabilityAssessmentScanResults) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/databasesqlvulnerabilityassessmentscans/predicates.go b/resource-manager/sql/2022-11-01-preview/databasesqlvulnerabilityassessmentscans/predicates.go
index 889ebcb2b2e..0d95495f278 100644
--- a/resource-manager/sql/2022-11-01-preview/databasesqlvulnerabilityassessmentscans/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/databasesqlvulnerabilityassessmentscans/predicates.go
@@ -11,15 +11,15 @@ type SqlVulnerabilityAssessmentScanRecordOperationPredicate struct {
 
 func (p SqlVulnerabilityAssessmentScanRecordOperationPredicate) Matches(input SqlVulnerabilityAssessmentScanRecord) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/databasesqlvulnerabilityassessmentssettings/predicates.go b/resource-manager/sql/2022-11-01-preview/databasesqlvulnerabilityassessmentssettings/predicates.go
index 35aeb49c271..cf36e70c15a 100644
--- a/resource-manager/sql/2022-11-01-preview/databasesqlvulnerabilityassessmentssettings/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/databasesqlvulnerabilityassessmentssettings/predicates.go
@@ -11,15 +11,15 @@ type SqlVulnerabilityAssessmentOperationPredicate struct {
 
 func (p SqlVulnerabilityAssessmentOperationPredicate) Matches(input SqlVulnerabilityAssessment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/databasetables/predicates.go b/resource-manager/sql/2022-11-01-preview/databasetables/predicates.go
index 9b2488e4fdf..2c942a576ba 100644
--- a/resource-manager/sql/2022-11-01-preview/databasetables/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/databasetables/predicates.go
@@ -11,15 +11,15 @@ type DatabaseTableOperationPredicate struct {
 
 func (p DatabaseTableOperationPredicate) Matches(input DatabaseTable) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/databaseusages/predicates.go b/resource-manager/sql/2022-11-01-preview/databaseusages/predicates.go
index 1dfb88852c9..0ae433ca19e 100644
--- a/resource-manager/sql/2022-11-01-preview/databaseusages/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/databaseusages/predicates.go
@@ -11,15 +11,15 @@ type DatabaseUsageOperationPredicate struct {
 
 func (p DatabaseUsageOperationPredicate) Matches(input DatabaseUsage) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/databasevulnerabilityassessments/predicates.go b/resource-manager/sql/2022-11-01-preview/databasevulnerabilityassessments/predicates.go
index a3e5cfec486..4f0c37586c8 100644
--- a/resource-manager/sql/2022-11-01-preview/databasevulnerabilityassessments/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/databasevulnerabilityassessments/predicates.go
@@ -11,15 +11,15 @@ type DatabaseVulnerabilityAssessmentOperationPredicate struct {
 
 func (p DatabaseVulnerabilityAssessmentOperationPredicate) Matches(input DatabaseVulnerabilityAssessment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/databasevulnerabilityassessmentscans/predicates.go b/resource-manager/sql/2022-11-01-preview/databasevulnerabilityassessmentscans/predicates.go
index 6279a0b9124..5794f6e1b2c 100644
--- a/resource-manager/sql/2022-11-01-preview/databasevulnerabilityassessmentscans/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/databasevulnerabilityassessmentscans/predicates.go
@@ -11,15 +11,15 @@ type VulnerabilityAssessmentScanRecordOperationPredicate struct {
 
 func (p VulnerabilityAssessmentScanRecordOperationPredicate) Matches(input VulnerabilityAssessmentScanRecord) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/datamaskingrules/predicates.go b/resource-manager/sql/2022-11-01-preview/datamaskingrules/predicates.go
index ccec04b5f9f..a5864e3f5e3 100644
--- a/resource-manager/sql/2022-11-01-preview/datamaskingrules/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/datamaskingrules/predicates.go
@@ -13,23 +13,23 @@ type DataMaskingRuleOperationPredicate struct {
 
 func (p DataMaskingRuleOperationPredicate) Matches(input DataMaskingRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/datawarehouseuseractivities/predicates.go b/resource-manager/sql/2022-11-01-preview/datawarehouseuseractivities/predicates.go
index 8e8a7b1b161..25dc9b0b353 100644
--- a/resource-manager/sql/2022-11-01-preview/datawarehouseuseractivities/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/datawarehouseuseractivities/predicates.go
@@ -11,15 +11,15 @@ type DataWarehouseUserActivitiesOperationPredicate struct {
 
 func (p DataWarehouseUserActivitiesOperationPredicate) Matches(input DataWarehouseUserActivities) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/deletedservers/predicates.go b/resource-manager/sql/2022-11-01-preview/deletedservers/predicates.go
index 971ce135e3b..9f570a85ad9 100644
--- a/resource-manager/sql/2022-11-01-preview/deletedservers/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/deletedservers/predicates.go
@@ -11,15 +11,15 @@ type DeletedServerOperationPredicate struct {
 
 func (p DeletedServerOperationPredicate) Matches(input DeletedServer) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/distributedavailabilitygroups/predicates.go b/resource-manager/sql/2022-11-01-preview/distributedavailabilitygroups/predicates.go
index 0a8b33ea04e..7e0a257a8fa 100644
--- a/resource-manager/sql/2022-11-01-preview/distributedavailabilitygroups/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/distributedavailabilitygroups/predicates.go
@@ -11,15 +11,15 @@ type DistributedAvailabilityGroupOperationPredicate struct {
 
 func (p DistributedAvailabilityGroupOperationPredicate) Matches(input DistributedAvailabilityGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/elasticpooloperations/predicates.go b/resource-manager/sql/2022-11-01-preview/elasticpooloperations/predicates.go
index a700cce7d65..2ac5a815355 100644
--- a/resource-manager/sql/2022-11-01-preview/elasticpooloperations/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/elasticpooloperations/predicates.go
@@ -11,15 +11,15 @@ type ElasticPoolOperationOperationPredicate struct {
 
 func (p ElasticPoolOperationOperationPredicate) Matches(input ElasticPoolOperation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/elasticpools/predicates.go b/resource-manager/sql/2022-11-01-preview/elasticpools/predicates.go
index 51a2bb1b817..baa6c2c92d7 100644
--- a/resource-manager/sql/2022-11-01-preview/elasticpools/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/elasticpools/predicates.go
@@ -13,11 +13,11 @@ type ElasticPoolOperationPredicate struct {
 
 func (p ElasticPoolOperationPredicate) Matches(input ElasticPool) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p ElasticPoolOperationPredicate) Matches(input ElasticPool) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/encryptionprotectors/predicates.go b/resource-manager/sql/2022-11-01-preview/encryptionprotectors/predicates.go
index 42b2b65d240..8ccad2732fb 100644
--- a/resource-manager/sql/2022-11-01-preview/encryptionprotectors/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/encryptionprotectors/predicates.go
@@ -13,23 +13,23 @@ type EncryptionProtectorOperationPredicate struct {
 
 func (p EncryptionProtectorOperationPredicate) Matches(input EncryptionProtector) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/endpointcertificates/predicates.go b/resource-manager/sql/2022-11-01-preview/endpointcertificates/predicates.go
index 0dc1fbd8e1a..d8ebdc5270e 100644
--- a/resource-manager/sql/2022-11-01-preview/endpointcertificates/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/endpointcertificates/predicates.go
@@ -11,15 +11,15 @@ type EndpointCertificateOperationPredicate struct {
 
 func (p EndpointCertificateOperationPredicate) Matches(input EndpointCertificate) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/failovergroups/predicates.go b/resource-manager/sql/2022-11-01-preview/failovergroups/predicates.go
index f63d2c1ef87..bba27fb4d10 100644
--- a/resource-manager/sql/2022-11-01-preview/failovergroups/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/failovergroups/predicates.go
@@ -12,19 +12,19 @@ type FailoverGroupOperationPredicate struct {
 
 func (p FailoverGroupOperationPredicate) Matches(input FailoverGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/firewallrules/predicates.go b/resource-manager/sql/2022-11-01-preview/firewallrules/predicates.go
index 1c6d22830c2..fb7011b1d3b 100644
--- a/resource-manager/sql/2022-11-01-preview/firewallrules/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/firewallrules/predicates.go
@@ -11,15 +11,15 @@ type FirewallRuleOperationPredicate struct {
 
 func (p FirewallRuleOperationPredicate) Matches(input FirewallRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/geobackuppolicies/predicates.go b/resource-manager/sql/2022-11-01-preview/geobackuppolicies/predicates.go
index 083d86abe6f..fceb42b3214 100644
--- a/resource-manager/sql/2022-11-01-preview/geobackuppolicies/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/geobackuppolicies/predicates.go
@@ -13,23 +13,23 @@ type GeoBackupPolicyOperationPredicate struct {
 
 func (p GeoBackupPolicyOperationPredicate) Matches(input GeoBackupPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/instancefailovergroups/predicates.go b/resource-manager/sql/2022-11-01-preview/instancefailovergroups/predicates.go
index f4870cb6892..bc1705b3dc4 100644
--- a/resource-manager/sql/2022-11-01-preview/instancefailovergroups/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/instancefailovergroups/predicates.go
@@ -11,15 +11,15 @@ type InstanceFailoverGroupOperationPredicate struct {
 
 func (p InstanceFailoverGroupOperationPredicate) Matches(input InstanceFailoverGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/instancepools/predicates.go b/resource-manager/sql/2022-11-01-preview/instancepools/predicates.go
index a569d211c2a..65903be2cc9 100644
--- a/resource-manager/sql/2022-11-01-preview/instancepools/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/instancepools/predicates.go
@@ -12,7 +12,7 @@ type InstancePoolOperationPredicate struct {
 
 func (p InstancePoolOperationPredicate) Matches(input InstancePool) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p InstancePoolOperationPredicate) Matches(input InstancePool) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/ipv6firewallrules/predicates.go b/resource-manager/sql/2022-11-01-preview/ipv6firewallrules/predicates.go
index fb4f838fa0f..2bc9ba46621 100644
--- a/resource-manager/sql/2022-11-01-preview/ipv6firewallrules/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/ipv6firewallrules/predicates.go
@@ -11,15 +11,15 @@ type IPv6FirewallRuleOperationPredicate struct {
 
 func (p IPv6FirewallRuleOperationPredicate) Matches(input IPv6FirewallRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/jobagents/predicates.go b/resource-manager/sql/2022-11-01-preview/jobagents/predicates.go
index 9af5edc96d3..0813f84a604 100644
--- a/resource-manager/sql/2022-11-01-preview/jobagents/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/jobagents/predicates.go
@@ -12,7 +12,7 @@ type JobAgentOperationPredicate struct {
 
 func (p JobAgentOperationPredicate) Matches(input JobAgent) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p JobAgentOperationPredicate) Matches(input JobAgent) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/jobcredentials/predicates.go b/resource-manager/sql/2022-11-01-preview/jobcredentials/predicates.go
index 3f5f9058d24..2aa2ac84e10 100644
--- a/resource-manager/sql/2022-11-01-preview/jobcredentials/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/jobcredentials/predicates.go
@@ -11,15 +11,15 @@ type JobCredentialOperationPredicate struct {
 
 func (p JobCredentialOperationPredicate) Matches(input JobCredential) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/jobexecutions/predicates.go b/resource-manager/sql/2022-11-01-preview/jobexecutions/predicates.go
index f216fc9c956..0f0cadef69d 100644
--- a/resource-manager/sql/2022-11-01-preview/jobexecutions/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/jobexecutions/predicates.go
@@ -11,15 +11,15 @@ type JobExecutionOperationPredicate struct {
 
 func (p JobExecutionOperationPredicate) Matches(input JobExecution) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/jobs/predicates.go b/resource-manager/sql/2022-11-01-preview/jobs/predicates.go
index 1722360a161..8326102dc52 100644
--- a/resource-manager/sql/2022-11-01-preview/jobs/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/jobs/predicates.go
@@ -11,15 +11,15 @@ type JobOperationPredicate struct {
 
 func (p JobOperationPredicate) Matches(input Job) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/jobstepexecutions/predicates.go b/resource-manager/sql/2022-11-01-preview/jobstepexecutions/predicates.go
index 620a69e91f0..9108f574a01 100644
--- a/resource-manager/sql/2022-11-01-preview/jobstepexecutions/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/jobstepexecutions/predicates.go
@@ -11,15 +11,15 @@ type JobExecutionOperationPredicate struct {
 
 func (p JobExecutionOperationPredicate) Matches(input JobExecution) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/jobsteps/predicates.go b/resource-manager/sql/2022-11-01-preview/jobsteps/predicates.go
index 0fd7a59f895..2011b5d8053 100644
--- a/resource-manager/sql/2022-11-01-preview/jobsteps/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/jobsteps/predicates.go
@@ -11,15 +11,15 @@ type JobStepOperationPredicate struct {
 
 func (p JobStepOperationPredicate) Matches(input JobStep) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/jobtargetexecutions/predicates.go b/resource-manager/sql/2022-11-01-preview/jobtargetexecutions/predicates.go
index d1c18ba9641..b2a71b3428f 100644
--- a/resource-manager/sql/2022-11-01-preview/jobtargetexecutions/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/jobtargetexecutions/predicates.go
@@ -11,15 +11,15 @@ type JobExecutionOperationPredicate struct {
 
 func (p JobExecutionOperationPredicate) Matches(input JobExecution) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/jobtargetgroups/predicates.go b/resource-manager/sql/2022-11-01-preview/jobtargetgroups/predicates.go
index 4707c2b9c81..b3389a0f643 100644
--- a/resource-manager/sql/2022-11-01-preview/jobtargetgroups/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/jobtargetgroups/predicates.go
@@ -11,15 +11,15 @@ type JobTargetGroupOperationPredicate struct {
 
 func (p JobTargetGroupOperationPredicate) Matches(input JobTargetGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/jobversions/predicates.go b/resource-manager/sql/2022-11-01-preview/jobversions/predicates.go
index 96f71f298aa..c1092c878ce 100644
--- a/resource-manager/sql/2022-11-01-preview/jobversions/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/jobversions/predicates.go
@@ -11,15 +11,15 @@ type ResourceOperationPredicate struct {
 
 func (p ResourceOperationPredicate) Matches(input Resource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/ledgerdigestuploads/predicates.go b/resource-manager/sql/2022-11-01-preview/ledgerdigestuploads/predicates.go
index 4d7bcf8da56..bf2a2ba00b9 100644
--- a/resource-manager/sql/2022-11-01-preview/ledgerdigestuploads/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/ledgerdigestuploads/predicates.go
@@ -11,15 +11,15 @@ type LedgerDigestUploadsOperationPredicate struct {
 
 func (p LedgerDigestUploadsOperationPredicate) Matches(input LedgerDigestUploads) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/longtermretentionbackups/predicates.go b/resource-manager/sql/2022-11-01-preview/longtermretentionbackups/predicates.go
index 15f967d0f4e..3f2817fce24 100644
--- a/resource-manager/sql/2022-11-01-preview/longtermretentionbackups/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/longtermretentionbackups/predicates.go
@@ -11,15 +11,15 @@ type LongTermRetentionBackupOperationPredicate struct {
 
 func (p LongTermRetentionBackupOperationPredicate) Matches(input LongTermRetentionBackup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/longtermretentionmanagedinstancebackups/predicates.go b/resource-manager/sql/2022-11-01-preview/longtermretentionmanagedinstancebackups/predicates.go
index 5a23e86392f..0110d8aa257 100644
--- a/resource-manager/sql/2022-11-01-preview/longtermretentionmanagedinstancebackups/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/longtermretentionmanagedinstancebackups/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstanceLongTermRetentionBackupOperationPredicate struct {
 
 func (p ManagedInstanceLongTermRetentionBackupOperationPredicate) Matches(input ManagedInstanceLongTermRetentionBackup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/longtermretentionpolicies/predicates.go b/resource-manager/sql/2022-11-01-preview/longtermretentionpolicies/predicates.go
index acf4cf72abf..66b4b6c12ed 100644
--- a/resource-manager/sql/2022-11-01-preview/longtermretentionpolicies/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/longtermretentionpolicies/predicates.go
@@ -11,15 +11,15 @@ type LongTermRetentionPolicyOperationPredicate struct {
 
 func (p LongTermRetentionPolicyOperationPredicate) Matches(input LongTermRetentionPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/managedbackupshorttermretentionpolicies/predicates.go b/resource-manager/sql/2022-11-01-preview/managedbackupshorttermretentionpolicies/predicates.go
index 310454c4447..fb75828a875 100644
--- a/resource-manager/sql/2022-11-01-preview/managedbackupshorttermretentionpolicies/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/managedbackupshorttermretentionpolicies/predicates.go
@@ -11,15 +11,15 @@ type ManagedBackupShortTermRetentionPolicyOperationPredicate struct {
 
 func (p ManagedBackupShortTermRetentionPolicyOperationPredicate) Matches(input ManagedBackupShortTermRetentionPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/manageddatabaseadvancedthreatprotectionsettings/predicates.go b/resource-manager/sql/2022-11-01-preview/manageddatabaseadvancedthreatprotectionsettings/predicates.go
index ad946aa4560..01d13385d0c 100644
--- a/resource-manager/sql/2022-11-01-preview/manageddatabaseadvancedthreatprotectionsettings/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/manageddatabaseadvancedthreatprotectionsettings/predicates.go
@@ -11,15 +11,15 @@ type ManagedDatabaseAdvancedThreatProtectionOperationPredicate struct {
 
 func (p ManagedDatabaseAdvancedThreatProtectionOperationPredicate) Matches(input ManagedDatabaseAdvancedThreatProtection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/manageddatabasecolumns/predicates.go b/resource-manager/sql/2022-11-01-preview/manageddatabasecolumns/predicates.go
index 4cf823a4f1f..e10d2347ca2 100644
--- a/resource-manager/sql/2022-11-01-preview/manageddatabasecolumns/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/manageddatabasecolumns/predicates.go
@@ -11,15 +11,15 @@ type DatabaseColumnOperationPredicate struct {
 
 func (p DatabaseColumnOperationPredicate) Matches(input DatabaseColumn) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/manageddatabasemoveoperations/predicates.go b/resource-manager/sql/2022-11-01-preview/manageddatabasemoveoperations/predicates.go
index 469abebdf63..1682e1d3047 100644
--- a/resource-manager/sql/2022-11-01-preview/manageddatabasemoveoperations/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/manageddatabasemoveoperations/predicates.go
@@ -11,15 +11,15 @@ type ManagedDatabaseMoveOperationResultOperationPredicate struct {
 
 func (p ManagedDatabaseMoveOperationResultOperationPredicate) Matches(input ManagedDatabaseMoveOperationResult) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/manageddatabasequeries/predicates.go b/resource-manager/sql/2022-11-01-preview/manageddatabasequeries/predicates.go
index 1858c9e53b0..e8225eeda46 100644
--- a/resource-manager/sql/2022-11-01-preview/manageddatabasequeries/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/manageddatabasequeries/predicates.go
@@ -11,15 +11,15 @@ type QueryStatisticsOperationPredicate struct {
 
 func (p QueryStatisticsOperationPredicate) Matches(input QueryStatistics) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/manageddatabases/predicates.go b/resource-manager/sql/2022-11-01-preview/manageddatabases/predicates.go
index 66c91b2a27b..3841529c83e 100644
--- a/resource-manager/sql/2022-11-01-preview/manageddatabases/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/manageddatabases/predicates.go
@@ -12,7 +12,7 @@ type ManagedDatabaseOperationPredicate struct {
 
 func (p ManagedDatabaseOperationPredicate) Matches(input ManagedDatabase) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ManagedDatabaseOperationPredicate) Matches(input ManagedDatabase) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/manageddatabaseschemas/predicates.go b/resource-manager/sql/2022-11-01-preview/manageddatabaseschemas/predicates.go
index 75bf2561c0f..92d0b757757 100644
--- a/resource-manager/sql/2022-11-01-preview/manageddatabaseschemas/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/manageddatabaseschemas/predicates.go
@@ -11,15 +11,15 @@ type ResourceOperationPredicate struct {
 
 func (p ResourceOperationPredicate) Matches(input Resource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/manageddatabasesecurityalertpolicies/predicates.go b/resource-manager/sql/2022-11-01-preview/manageddatabasesecurityalertpolicies/predicates.go
index 4c8f2abc9ee..8cce85428fa 100644
--- a/resource-manager/sql/2022-11-01-preview/manageddatabasesecurityalertpolicies/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/manageddatabasesecurityalertpolicies/predicates.go
@@ -11,15 +11,15 @@ type ManagedDatabaseSecurityAlertPolicyOperationPredicate struct {
 
 func (p ManagedDatabaseSecurityAlertPolicyOperationPredicate) Matches(input ManagedDatabaseSecurityAlertPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/manageddatabasesecurityevents/predicates.go b/resource-manager/sql/2022-11-01-preview/manageddatabasesecurityevents/predicates.go
index 1c1d650ea21..245970161e1 100644
--- a/resource-manager/sql/2022-11-01-preview/manageddatabasesecurityevents/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/manageddatabasesecurityevents/predicates.go
@@ -11,15 +11,15 @@ type SecurityEventOperationPredicate struct {
 
 func (p SecurityEventOperationPredicate) Matches(input SecurityEvent) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/manageddatabasesensitivitylabels/predicates.go b/resource-manager/sql/2022-11-01-preview/manageddatabasesensitivitylabels/predicates.go
index eda14b7d9b0..12545dcc919 100644
--- a/resource-manager/sql/2022-11-01-preview/manageddatabasesensitivitylabels/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/manageddatabasesensitivitylabels/predicates.go
@@ -12,19 +12,19 @@ type SensitivityLabelOperationPredicate struct {
 
 func (p SensitivityLabelOperationPredicate) Matches(input SensitivityLabel) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/manageddatabasetables/predicates.go b/resource-manager/sql/2022-11-01-preview/manageddatabasetables/predicates.go
index 6cd4587fc3b..e9eb18274d2 100644
--- a/resource-manager/sql/2022-11-01-preview/manageddatabasetables/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/manageddatabasetables/predicates.go
@@ -11,15 +11,15 @@ type DatabaseTableOperationPredicate struct {
 
 func (p DatabaseTableOperationPredicate) Matches(input DatabaseTable) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/manageddatabasetransparentdataencryption/predicates.go b/resource-manager/sql/2022-11-01-preview/manageddatabasetransparentdataencryption/predicates.go
index 4ec7c6171bc..18ed9b33301 100644
--- a/resource-manager/sql/2022-11-01-preview/manageddatabasetransparentdataencryption/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/manageddatabasetransparentdataencryption/predicates.go
@@ -11,15 +11,15 @@ type ManagedTransparentDataEncryptionOperationPredicate struct {
 
 func (p ManagedTransparentDataEncryptionOperationPredicate) Matches(input ManagedTransparentDataEncryption) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/manageddatabasevulnerabilityassessments/predicates.go b/resource-manager/sql/2022-11-01-preview/manageddatabasevulnerabilityassessments/predicates.go
index d628429b37f..5254e2baffc 100644
--- a/resource-manager/sql/2022-11-01-preview/manageddatabasevulnerabilityassessments/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/manageddatabasevulnerabilityassessments/predicates.go
@@ -11,15 +11,15 @@ type DatabaseVulnerabilityAssessmentOperationPredicate struct {
 
 func (p DatabaseVulnerabilityAssessmentOperationPredicate) Matches(input DatabaseVulnerabilityAssessment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/manageddatabasevulnerabilityassessmentscans/predicates.go b/resource-manager/sql/2022-11-01-preview/manageddatabasevulnerabilityassessmentscans/predicates.go
index 5b1cd5058d0..5f80e6070ce 100644
--- a/resource-manager/sql/2022-11-01-preview/manageddatabasevulnerabilityassessmentscans/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/manageddatabasevulnerabilityassessmentscans/predicates.go
@@ -11,15 +11,15 @@ type VulnerabilityAssessmentScanRecordOperationPredicate struct {
 
 func (p VulnerabilityAssessmentScanRecordOperationPredicate) Matches(input VulnerabilityAssessmentScanRecord) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/managedinstanceadministrators/predicates.go b/resource-manager/sql/2022-11-01-preview/managedinstanceadministrators/predicates.go
index 1e4aff885cf..d8dcbcc98be 100644
--- a/resource-manager/sql/2022-11-01-preview/managedinstanceadministrators/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/managedinstanceadministrators/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstanceAdministratorOperationPredicate struct {
 
 func (p ManagedInstanceAdministratorOperationPredicate) Matches(input ManagedInstanceAdministrator) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/managedinstanceadvancedthreatprotectionsettings/predicates.go b/resource-manager/sql/2022-11-01-preview/managedinstanceadvancedthreatprotectionsettings/predicates.go
index c7b45e527be..d926de0e8c8 100644
--- a/resource-manager/sql/2022-11-01-preview/managedinstanceadvancedthreatprotectionsettings/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/managedinstanceadvancedthreatprotectionsettings/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstanceAdvancedThreatProtectionOperationPredicate struct {
 
 func (p ManagedInstanceAdvancedThreatProtectionOperationPredicate) Matches(input ManagedInstanceAdvancedThreatProtection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/managedinstanceazureadonlyauthentications/predicates.go b/resource-manager/sql/2022-11-01-preview/managedinstanceazureadonlyauthentications/predicates.go
index 211a4295e0e..26056826c21 100644
--- a/resource-manager/sql/2022-11-01-preview/managedinstanceazureadonlyauthentications/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/managedinstanceazureadonlyauthentications/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstanceAzureADOnlyAuthenticationOperationPredicate struct {
 
 func (p ManagedInstanceAzureADOnlyAuthenticationOperationPredicate) Matches(input ManagedInstanceAzureADOnlyAuthentication) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/managedinstancedtcs/predicates.go b/resource-manager/sql/2022-11-01-preview/managedinstancedtcs/predicates.go
index db410c459dd..4ebde0c6a52 100644
--- a/resource-manager/sql/2022-11-01-preview/managedinstancedtcs/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/managedinstancedtcs/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstanceDtcOperationPredicate struct {
 
 func (p ManagedInstanceDtcOperationPredicate) Matches(input ManagedInstanceDtc) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/managedinstanceencryptionprotectors/predicates.go b/resource-manager/sql/2022-11-01-preview/managedinstanceencryptionprotectors/predicates.go
index f8be7ee2d4b..3d36552bf7f 100644
--- a/resource-manager/sql/2022-11-01-preview/managedinstanceencryptionprotectors/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/managedinstanceencryptionprotectors/predicates.go
@@ -12,19 +12,19 @@ type ManagedInstanceEncryptionProtectorOperationPredicate struct {
 
 func (p ManagedInstanceEncryptionProtectorOperationPredicate) Matches(input ManagedInstanceEncryptionProtector) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/managedinstancekeys/predicates.go b/resource-manager/sql/2022-11-01-preview/managedinstancekeys/predicates.go
index f7242b611b2..9d02a4bfacd 100644
--- a/resource-manager/sql/2022-11-01-preview/managedinstancekeys/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/managedinstancekeys/predicates.go
@@ -12,19 +12,19 @@ type ManagedInstanceKeyOperationPredicate struct {
 
 func (p ManagedInstanceKeyOperationPredicate) Matches(input ManagedInstanceKey) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/managedinstancelongtermretentionpolicies/predicates.go b/resource-manager/sql/2022-11-01-preview/managedinstancelongtermretentionpolicies/predicates.go
index 596418130f1..8ab8e0bab1f 100644
--- a/resource-manager/sql/2022-11-01-preview/managedinstancelongtermretentionpolicies/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/managedinstancelongtermretentionpolicies/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstanceLongTermRetentionPolicyOperationPredicate struct {
 
 func (p ManagedInstanceLongTermRetentionPolicyOperationPredicate) Matches(input ManagedInstanceLongTermRetentionPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/managedinstanceoperations/predicates.go b/resource-manager/sql/2022-11-01-preview/managedinstanceoperations/predicates.go
index c3c281bd561..58a7ff1293e 100644
--- a/resource-manager/sql/2022-11-01-preview/managedinstanceoperations/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/managedinstanceoperations/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstanceOperationOperationPredicate struct {
 
 func (p ManagedInstanceOperationOperationPredicate) Matches(input ManagedInstanceOperation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/managedinstanceprivateendpointconnections/predicates.go b/resource-manager/sql/2022-11-01-preview/managedinstanceprivateendpointconnections/predicates.go
index 73846575128..9487375b565 100644
--- a/resource-manager/sql/2022-11-01-preview/managedinstanceprivateendpointconnections/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/managedinstanceprivateendpointconnections/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstancePrivateEndpointConnectionOperationPredicate struct {
 
 func (p ManagedInstancePrivateEndpointConnectionOperationPredicate) Matches(input ManagedInstancePrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/managedinstanceprivatelinkresources/predicates.go b/resource-manager/sql/2022-11-01-preview/managedinstanceprivatelinkresources/predicates.go
index 0e780f2f02f..f17642eb3dc 100644
--- a/resource-manager/sql/2022-11-01-preview/managedinstanceprivatelinkresources/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/managedinstanceprivatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstancePrivateLinkOperationPredicate struct {
 
 func (p ManagedInstancePrivateLinkOperationPredicate) Matches(input ManagedInstancePrivateLink) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/managedinstances/predicates.go b/resource-manager/sql/2022-11-01-preview/managedinstances/predicates.go
index 35433ddbf74..8d70aa8a061 100644
--- a/resource-manager/sql/2022-11-01-preview/managedinstances/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/managedinstances/predicates.go
@@ -12,7 +12,7 @@ type ManagedInstanceOperationPredicate struct {
 
 func (p ManagedInstanceOperationPredicate) Matches(input ManagedInstance) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p ManagedInstanceOperationPredicate) Matches(input ManagedInstance) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -37,7 +37,7 @@ type OutboundEnvironmentEndpointOperationPredicate struct {
 
 func (p OutboundEnvironmentEndpointOperationPredicate) Matches(input OutboundEnvironmentEndpoint) bool {
 
-	if p.Category != nil && (input.Category == nil && *p.Category != *input.Category) {
+	if p.Category != nil && (input.Category == nil || *p.Category != *input.Category) {
 		return false
 	}
 
@@ -54,23 +54,23 @@ type TopQueriesOperationPredicate struct {
 
 func (p TopQueriesOperationPredicate) Matches(input TopQueries) bool {
 
-	if p.AggregationFunction != nil && (input.AggregationFunction == nil && *p.AggregationFunction != *input.AggregationFunction) {
+	if p.AggregationFunction != nil && (input.AggregationFunction == nil || *p.AggregationFunction != *input.AggregationFunction) {
 		return false
 	}
 
-	if p.EndTime != nil && (input.EndTime == nil && *p.EndTime != *input.EndTime) {
+	if p.EndTime != nil && (input.EndTime == nil || *p.EndTime != *input.EndTime) {
 		return false
 	}
 
-	if p.NumberOfQueries != nil && (input.NumberOfQueries == nil && *p.NumberOfQueries != *input.NumberOfQueries) {
+	if p.NumberOfQueries != nil && (input.NumberOfQueries == nil || *p.NumberOfQueries != *input.NumberOfQueries) {
 		return false
 	}
 
-	if p.ObservationMetric != nil && (input.ObservationMetric == nil && *p.ObservationMetric != *input.ObservationMetric) {
+	if p.ObservationMetric != nil && (input.ObservationMetric == nil || *p.ObservationMetric != *input.ObservationMetric) {
 		return false
 	}
 
-	if p.StartTime != nil && (input.StartTime == nil && *p.StartTime != *input.StartTime) {
+	if p.StartTime != nil && (input.StartTime == nil || *p.StartTime != *input.StartTime) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/managedinstancevulnerabilityassessments/predicates.go b/resource-manager/sql/2022-11-01-preview/managedinstancevulnerabilityassessments/predicates.go
index 14b00fe56b2..74c244d5479 100644
--- a/resource-manager/sql/2022-11-01-preview/managedinstancevulnerabilityassessments/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/managedinstancevulnerabilityassessments/predicates.go
@@ -11,15 +11,15 @@ type ManagedInstanceVulnerabilityAssessmentOperationPredicate struct {
 
 func (p ManagedInstanceVulnerabilityAssessmentOperationPredicate) Matches(input ManagedInstanceVulnerabilityAssessment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/managedledgerdigestuploads/predicates.go b/resource-manager/sql/2022-11-01-preview/managedledgerdigestuploads/predicates.go
index ae1115ca7f8..3b918d87f53 100644
--- a/resource-manager/sql/2022-11-01-preview/managedledgerdigestuploads/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/managedledgerdigestuploads/predicates.go
@@ -11,15 +11,15 @@ type ManagedLedgerDigestUploadsOperationPredicate struct {
 
 func (p ManagedLedgerDigestUploadsOperationPredicate) Matches(input ManagedLedgerDigestUploads) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/managedrestorabledroppeddatabasebackupshorttermretentionpolicies/predicates.go b/resource-manager/sql/2022-11-01-preview/managedrestorabledroppeddatabasebackupshorttermretentionpolicies/predicates.go
index 0c7af11d4d5..c6890ca1ddf 100644
--- a/resource-manager/sql/2022-11-01-preview/managedrestorabledroppeddatabasebackupshorttermretentionpolicies/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/managedrestorabledroppeddatabasebackupshorttermretentionpolicies/predicates.go
@@ -11,15 +11,15 @@ type ManagedBackupShortTermRetentionPolicyOperationPredicate struct {
 
 func (p ManagedBackupShortTermRetentionPolicyOperationPredicate) Matches(input ManagedBackupShortTermRetentionPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/managedserverdnsaliases/predicates.go b/resource-manager/sql/2022-11-01-preview/managedserverdnsaliases/predicates.go
index 2d6ae30f379..e28462262fe 100644
--- a/resource-manager/sql/2022-11-01-preview/managedserverdnsaliases/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/managedserverdnsaliases/predicates.go
@@ -11,15 +11,15 @@ type ManagedServerDnsAliasOperationPredicate struct {
 
 func (p ManagedServerDnsAliasOperationPredicate) Matches(input ManagedServerDnsAlias) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/managedserversecurityalertpolicies/predicates.go b/resource-manager/sql/2022-11-01-preview/managedserversecurityalertpolicies/predicates.go
index 83e1986a11b..c7d46c58a0f 100644
--- a/resource-manager/sql/2022-11-01-preview/managedserversecurityalertpolicies/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/managedserversecurityalertpolicies/predicates.go
@@ -11,15 +11,15 @@ type ManagedServerSecurityAlertPolicyOperationPredicate struct {
 
 func (p ManagedServerSecurityAlertPolicyOperationPredicate) Matches(input ManagedServerSecurityAlertPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/networksecurityperimeterconfigurations/predicates.go b/resource-manager/sql/2022-11-01-preview/networksecurityperimeterconfigurations/predicates.go
index a044ab4ac32..fd3dce574e9 100644
--- a/resource-manager/sql/2022-11-01-preview/networksecurityperimeterconfigurations/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/networksecurityperimeterconfigurations/predicates.go
@@ -11,15 +11,15 @@ type NetworkSecurityPerimeterConfigurationOperationPredicate struct {
 
 func (p NetworkSecurityPerimeterConfigurationOperationPredicate) Matches(input NetworkSecurityPerimeterConfiguration) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/outboundfirewallrules/predicates.go b/resource-manager/sql/2022-11-01-preview/outboundfirewallrules/predicates.go
index 1d47a879f9a..9d87029d13c 100644
--- a/resource-manager/sql/2022-11-01-preview/outboundfirewallrules/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/outboundfirewallrules/predicates.go
@@ -11,15 +11,15 @@ type OutboundFirewallRuleOperationPredicate struct {
 
 func (p OutboundFirewallRuleOperationPredicate) Matches(input OutboundFirewallRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/privateendpointconnections/predicates.go b/resource-manager/sql/2022-11-01-preview/privateendpointconnections/predicates.go
index bea3f66b397..4a03a91ce52 100644
--- a/resource-manager/sql/2022-11-01-preview/privateendpointconnections/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/privateendpointconnections/predicates.go
@@ -11,15 +11,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/privatelinkresources/predicates.go b/resource-manager/sql/2022-11-01-preview/privatelinkresources/predicates.go
index 29d787f073a..19b771c3994 100644
--- a/resource-manager/sql/2022-11-01-preview/privatelinkresources/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/privatelinkresources/predicates.go
@@ -11,15 +11,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/recoverabledatabases/predicates.go b/resource-manager/sql/2022-11-01-preview/recoverabledatabases/predicates.go
index a75e6fb49b1..829eeb8ad7d 100644
--- a/resource-manager/sql/2022-11-01-preview/recoverabledatabases/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/recoverabledatabases/predicates.go
@@ -11,15 +11,15 @@ type RecoverableDatabaseOperationPredicate struct {
 
 func (p RecoverableDatabaseOperationPredicate) Matches(input RecoverableDatabase) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/recoverablemanageddatabases/predicates.go b/resource-manager/sql/2022-11-01-preview/recoverablemanageddatabases/predicates.go
index 7b6f76bac6e..e7c04e344c3 100644
--- a/resource-manager/sql/2022-11-01-preview/recoverablemanageddatabases/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/recoverablemanageddatabases/predicates.go
@@ -11,15 +11,15 @@ type RecoverableManagedDatabaseOperationPredicate struct {
 
 func (p RecoverableManagedDatabaseOperationPredicate) Matches(input RecoverableManagedDatabase) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/replicationlinks/predicates.go b/resource-manager/sql/2022-11-01-preview/replicationlinks/predicates.go
index 03eccc3aa3b..d148d45bd2b 100644
--- a/resource-manager/sql/2022-11-01-preview/replicationlinks/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/replicationlinks/predicates.go
@@ -11,15 +11,15 @@ type ReplicationLinkOperationPredicate struct {
 
 func (p ReplicationLinkOperationPredicate) Matches(input ReplicationLink) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/restorabledroppeddatabases/predicates.go b/resource-manager/sql/2022-11-01-preview/restorabledroppeddatabases/predicates.go
index 74f2093eeef..539816771bc 100644
--- a/resource-manager/sql/2022-11-01-preview/restorabledroppeddatabases/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/restorabledroppeddatabases/predicates.go
@@ -12,19 +12,19 @@ type RestorableDroppedDatabaseOperationPredicate struct {
 
 func (p RestorableDroppedDatabaseOperationPredicate) Matches(input RestorableDroppedDatabase) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/restorabledroppedmanageddatabases/predicates.go b/resource-manager/sql/2022-11-01-preview/restorabledroppedmanageddatabases/predicates.go
index 02b9f5cb1ba..4ccec82b5ad 100644
--- a/resource-manager/sql/2022-11-01-preview/restorabledroppedmanageddatabases/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/restorabledroppedmanageddatabases/predicates.go
@@ -12,7 +12,7 @@ type RestorableDroppedManagedDatabaseOperationPredicate struct {
 
 func (p RestorableDroppedManagedDatabaseOperationPredicate) Matches(input RestorableDroppedManagedDatabase) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p RestorableDroppedManagedDatabaseOperationPredicate) Matches(input Restor
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/restorepoints/predicates.go b/resource-manager/sql/2022-11-01-preview/restorepoints/predicates.go
index 4c0eba23f55..163b30b8206 100644
--- a/resource-manager/sql/2022-11-01-preview/restorepoints/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/restorepoints/predicates.go
@@ -12,19 +12,19 @@ type RestorePointOperationPredicate struct {
 
 func (p RestorePointOperationPredicate) Matches(input RestorePoint) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/sensitivitylabels/predicates.go b/resource-manager/sql/2022-11-01-preview/sensitivitylabels/predicates.go
index 832a5ff4413..c3026932143 100644
--- a/resource-manager/sql/2022-11-01-preview/sensitivitylabels/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/sensitivitylabels/predicates.go
@@ -12,19 +12,19 @@ type SensitivityLabelOperationPredicate struct {
 
 func (p SensitivityLabelOperationPredicate) Matches(input SensitivityLabel) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/serveradvancedthreatprotectionsettings/predicates.go b/resource-manager/sql/2022-11-01-preview/serveradvancedthreatprotectionsettings/predicates.go
index 3e16d941e40..d76325ab336 100644
--- a/resource-manager/sql/2022-11-01-preview/serveradvancedthreatprotectionsettings/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/serveradvancedthreatprotectionsettings/predicates.go
@@ -11,15 +11,15 @@ type ServerAdvancedThreatProtectionOperationPredicate struct {
 
 func (p ServerAdvancedThreatProtectionOperationPredicate) Matches(input ServerAdvancedThreatProtection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/serverazureadadministrators/predicates.go b/resource-manager/sql/2022-11-01-preview/serverazureadadministrators/predicates.go
index 071f416faf3..8049433d6c4 100644
--- a/resource-manager/sql/2022-11-01-preview/serverazureadadministrators/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/serverazureadadministrators/predicates.go
@@ -11,15 +11,15 @@ type ServerAzureADAdministratorOperationPredicate struct {
 
 func (p ServerAzureADAdministratorOperationPredicate) Matches(input ServerAzureADAdministrator) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/serverazureadonlyauthentications/predicates.go b/resource-manager/sql/2022-11-01-preview/serverazureadonlyauthentications/predicates.go
index a0e05a12e7b..fa774ebe409 100644
--- a/resource-manager/sql/2022-11-01-preview/serverazureadonlyauthentications/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/serverazureadonlyauthentications/predicates.go
@@ -11,15 +11,15 @@ type ServerAzureADOnlyAuthenticationOperationPredicate struct {
 
 func (p ServerAzureADOnlyAuthenticationOperationPredicate) Matches(input ServerAzureADOnlyAuthentication) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/serverconfigurationoptions/predicates.go b/resource-manager/sql/2022-11-01-preview/serverconfigurationoptions/predicates.go
index ac9df0b54cb..827eda2a4df 100644
--- a/resource-manager/sql/2022-11-01-preview/serverconfigurationoptions/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/serverconfigurationoptions/predicates.go
@@ -11,15 +11,15 @@ type ServerConfigurationOptionOperationPredicate struct {
 
 func (p ServerConfigurationOptionOperationPredicate) Matches(input ServerConfigurationOption) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/serverconnectionpolicies/predicates.go b/resource-manager/sql/2022-11-01-preview/serverconnectionpolicies/predicates.go
index 3daef1ac8e0..4a6e9697786 100644
--- a/resource-manager/sql/2022-11-01-preview/serverconnectionpolicies/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/serverconnectionpolicies/predicates.go
@@ -13,23 +13,23 @@ type ServerConnectionPolicyOperationPredicate struct {
 
 func (p ServerConnectionPolicyOperationPredicate) Matches(input ServerConnectionPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/serverdevopsaudit/predicates.go b/resource-manager/sql/2022-11-01-preview/serverdevopsaudit/predicates.go
index d65ddae23ff..249e3853d29 100644
--- a/resource-manager/sql/2022-11-01-preview/serverdevopsaudit/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/serverdevopsaudit/predicates.go
@@ -11,15 +11,15 @@ type ServerDevOpsAuditingSettingsOperationPredicate struct {
 
 func (p ServerDevOpsAuditingSettingsOperationPredicate) Matches(input ServerDevOpsAuditingSettings) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/serverdnsaliases/predicates.go b/resource-manager/sql/2022-11-01-preview/serverdnsaliases/predicates.go
index dd46ec9f297..964f164db6c 100644
--- a/resource-manager/sql/2022-11-01-preview/serverdnsaliases/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/serverdnsaliases/predicates.go
@@ -11,15 +11,15 @@ type ServerDnsAliasOperationPredicate struct {
 
 func (p ServerDnsAliasOperationPredicate) Matches(input ServerDnsAlias) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/serverkeys/predicates.go b/resource-manager/sql/2022-11-01-preview/serverkeys/predicates.go
index f06083326c5..e0882f7257e 100644
--- a/resource-manager/sql/2022-11-01-preview/serverkeys/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/serverkeys/predicates.go
@@ -13,23 +13,23 @@ type ServerKeyOperationPredicate struct {
 
 func (p ServerKeyOperationPredicate) Matches(input ServerKey) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/serveroperations/predicates.go b/resource-manager/sql/2022-11-01-preview/serveroperations/predicates.go
index 780fc572342..c23369f7156 100644
--- a/resource-manager/sql/2022-11-01-preview/serveroperations/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/serveroperations/predicates.go
@@ -11,15 +11,15 @@ type ServerOperationOperationPredicate struct {
 
 func (p ServerOperationOperationPredicate) Matches(input ServerOperation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/servers/predicates.go b/resource-manager/sql/2022-11-01-preview/servers/predicates.go
index 1c1669056ea..c6dce7be40c 100644
--- a/resource-manager/sql/2022-11-01-preview/servers/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/servers/predicates.go
@@ -13,11 +13,11 @@ type ServerOperationPredicate struct {
 
 func (p ServerOperationPredicate) Matches(input Server) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p ServerOperationPredicate) Matches(input Server) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/serversecurityalertpolicies/predicates.go b/resource-manager/sql/2022-11-01-preview/serversecurityalertpolicies/predicates.go
index ac6768d8eb2..ff213a5f292 100644
--- a/resource-manager/sql/2022-11-01-preview/serversecurityalertpolicies/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/serversecurityalertpolicies/predicates.go
@@ -11,15 +11,15 @@ type ServerSecurityAlertPolicyOperationPredicate struct {
 
 func (p ServerSecurityAlertPolicyOperationPredicate) Matches(input ServerSecurityAlertPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/servertrustcertificates/predicates.go b/resource-manager/sql/2022-11-01-preview/servertrustcertificates/predicates.go
index b21d06ca3cc..81cc0b4c36a 100644
--- a/resource-manager/sql/2022-11-01-preview/servertrustcertificates/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/servertrustcertificates/predicates.go
@@ -11,15 +11,15 @@ type ServerTrustCertificateOperationPredicate struct {
 
 func (p ServerTrustCertificateOperationPredicate) Matches(input ServerTrustCertificate) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/servertrustgroups/predicates.go b/resource-manager/sql/2022-11-01-preview/servertrustgroups/predicates.go
index 218be5ad42f..92b66b22438 100644
--- a/resource-manager/sql/2022-11-01-preview/servertrustgroups/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/servertrustgroups/predicates.go
@@ -11,15 +11,15 @@ type ServerTrustGroupOperationPredicate struct {
 
 func (p ServerTrustGroupOperationPredicate) Matches(input ServerTrustGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/serverusages/predicates.go b/resource-manager/sql/2022-11-01-preview/serverusages/predicates.go
index a83e246a06d..086c2bd1918 100644
--- a/resource-manager/sql/2022-11-01-preview/serverusages/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/serverusages/predicates.go
@@ -11,15 +11,15 @@ type ServerUsageOperationPredicate struct {
 
 func (p ServerUsageOperationPredicate) Matches(input ServerUsage) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/servervulnerabilityassessments/predicates.go b/resource-manager/sql/2022-11-01-preview/servervulnerabilityassessments/predicates.go
index 6adc538840b..cba9908c5fe 100644
--- a/resource-manager/sql/2022-11-01-preview/servervulnerabilityassessments/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/servervulnerabilityassessments/predicates.go
@@ -11,15 +11,15 @@ type ServerVulnerabilityAssessmentOperationPredicate struct {
 
 func (p ServerVulnerabilityAssessmentOperationPredicate) Matches(input ServerVulnerabilityAssessment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/sqlvulnerabilityassessmentbaseline/predicates.go b/resource-manager/sql/2022-11-01-preview/sqlvulnerabilityassessmentbaseline/predicates.go
index da36b30573b..44e30273ae7 100644
--- a/resource-manager/sql/2022-11-01-preview/sqlvulnerabilityassessmentbaseline/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/sqlvulnerabilityassessmentbaseline/predicates.go
@@ -11,15 +11,15 @@ type DatabaseSqlVulnerabilityAssessmentBaselineSetOperationPredicate struct {
 
 func (p DatabaseSqlVulnerabilityAssessmentBaselineSetOperationPredicate) Matches(input DatabaseSqlVulnerabilityAssessmentBaselineSet) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/sqlvulnerabilityassessmentrulebaseline/predicates.go b/resource-manager/sql/2022-11-01-preview/sqlvulnerabilityassessmentrulebaseline/predicates.go
index 12a71dd5b52..3a316472e5d 100644
--- a/resource-manager/sql/2022-11-01-preview/sqlvulnerabilityassessmentrulebaseline/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/sqlvulnerabilityassessmentrulebaseline/predicates.go
@@ -11,15 +11,15 @@ type DatabaseSqlVulnerabilityAssessmentRuleBaselineOperationPredicate struct {
 
 func (p DatabaseSqlVulnerabilityAssessmentRuleBaselineOperationPredicate) Matches(input DatabaseSqlVulnerabilityAssessmentRuleBaseline) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/sqlvulnerabilityassessmentscanresult/predicates.go b/resource-manager/sql/2022-11-01-preview/sqlvulnerabilityassessmentscanresult/predicates.go
index de545441476..9e077ad7c5e 100644
--- a/resource-manager/sql/2022-11-01-preview/sqlvulnerabilityassessmentscanresult/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/sqlvulnerabilityassessmentscanresult/predicates.go
@@ -11,15 +11,15 @@ type SqlVulnerabilityAssessmentScanResultsOperationPredicate struct {
 
 func (p SqlVulnerabilityAssessmentScanResultsOperationPredicate) Matches(input SqlVulnerabilityAssessmentScanResults) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/sqlvulnerabilityassessmentscans/predicates.go b/resource-manager/sql/2022-11-01-preview/sqlvulnerabilityassessmentscans/predicates.go
index 7e38fd0f789..841a4654ae5 100644
--- a/resource-manager/sql/2022-11-01-preview/sqlvulnerabilityassessmentscans/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/sqlvulnerabilityassessmentscans/predicates.go
@@ -11,15 +11,15 @@ type SqlVulnerabilityAssessmentScanRecordOperationPredicate struct {
 
 func (p SqlVulnerabilityAssessmentScanRecordOperationPredicate) Matches(input SqlVulnerabilityAssessmentScanRecord) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/sqlvulnerabilityassessmentssettings/predicates.go b/resource-manager/sql/2022-11-01-preview/sqlvulnerabilityassessmentssettings/predicates.go
index 5c9eb5df9d4..ca44a89aef8 100644
--- a/resource-manager/sql/2022-11-01-preview/sqlvulnerabilityassessmentssettings/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/sqlvulnerabilityassessmentssettings/predicates.go
@@ -11,15 +11,15 @@ type SqlVulnerabilityAssessmentOperationPredicate struct {
 
 func (p SqlVulnerabilityAssessmentOperationPredicate) Matches(input SqlVulnerabilityAssessment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/startstopmanagedinstanceschedules/predicates.go b/resource-manager/sql/2022-11-01-preview/startstopmanagedinstanceschedules/predicates.go
index 00246deb608..60606bc2f22 100644
--- a/resource-manager/sql/2022-11-01-preview/startstopmanagedinstanceschedules/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/startstopmanagedinstanceschedules/predicates.go
@@ -11,15 +11,15 @@ type StartStopManagedInstanceScheduleOperationPredicate struct {
 
 func (p StartStopManagedInstanceScheduleOperationPredicate) Matches(input StartStopManagedInstanceSchedule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/subscriptionusages/predicates.go b/resource-manager/sql/2022-11-01-preview/subscriptionusages/predicates.go
index 06a043722c0..f47c43bd9ee 100644
--- a/resource-manager/sql/2022-11-01-preview/subscriptionusages/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/subscriptionusages/predicates.go
@@ -11,15 +11,15 @@ type SubscriptionUsageOperationPredicate struct {
 
 func (p SubscriptionUsageOperationPredicate) Matches(input SubscriptionUsage) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/synapselinkworkspaces/predicates.go b/resource-manager/sql/2022-11-01-preview/synapselinkworkspaces/predicates.go
index 68ac94f7825..8158a7bb3e3 100644
--- a/resource-manager/sql/2022-11-01-preview/synapselinkworkspaces/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/synapselinkworkspaces/predicates.go
@@ -11,15 +11,15 @@ type SynapseLinkWorkspaceOperationPredicate struct {
 
 func (p SynapseLinkWorkspaceOperationPredicate) Matches(input SynapseLinkWorkspace) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/syncagents/predicates.go b/resource-manager/sql/2022-11-01-preview/syncagents/predicates.go
index 0f2b289931f..962878c79f0 100644
--- a/resource-manager/sql/2022-11-01-preview/syncagents/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/syncagents/predicates.go
@@ -11,15 +11,15 @@ type SyncAgentOperationPredicate struct {
 
 func (p SyncAgentOperationPredicate) Matches(input SyncAgent) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type SyncAgentLinkedDatabaseOperationPredicate struct {
 
 func (p SyncAgentLinkedDatabaseOperationPredicate) Matches(input SyncAgentLinkedDatabase) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/syncgroups/predicates.go b/resource-manager/sql/2022-11-01-preview/syncgroups/predicates.go
index 4808f7bc8a8..69e910a85ce 100644
--- a/resource-manager/sql/2022-11-01-preview/syncgroups/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/syncgroups/predicates.go
@@ -9,7 +9,7 @@ type SyncDatabaseIdPropertiesOperationPredicate struct {
 
 func (p SyncDatabaseIdPropertiesOperationPredicate) Matches(input SyncDatabaseIdProperties) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -22,7 +22,7 @@ type SyncFullSchemaPropertiesOperationPredicate struct {
 
 func (p SyncFullSchemaPropertiesOperationPredicate) Matches(input SyncFullSchemaProperties) bool {
 
-	if p.LastUpdateTime != nil && (input.LastUpdateTime == nil && *p.LastUpdateTime != *input.LastUpdateTime) {
+	if p.LastUpdateTime != nil && (input.LastUpdateTime == nil || *p.LastUpdateTime != *input.LastUpdateTime) {
 		return false
 	}
 
@@ -37,15 +37,15 @@ type SyncGroupOperationPredicate struct {
 
 func (p SyncGroupOperationPredicate) Matches(input SyncGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -62,23 +62,23 @@ type SyncGroupLogPropertiesOperationPredicate struct {
 
 func (p SyncGroupLogPropertiesOperationPredicate) Matches(input SyncGroupLogProperties) bool {
 
-	if p.Details != nil && (input.Details == nil && *p.Details != *input.Details) {
+	if p.Details != nil && (input.Details == nil || *p.Details != *input.Details) {
 		return false
 	}
 
-	if p.OperationStatus != nil && (input.OperationStatus == nil && *p.OperationStatus != *input.OperationStatus) {
+	if p.OperationStatus != nil && (input.OperationStatus == nil || *p.OperationStatus != *input.OperationStatus) {
 		return false
 	}
 
-	if p.Source != nil && (input.Source == nil && *p.Source != *input.Source) {
+	if p.Source != nil && (input.Source == nil || *p.Source != *input.Source) {
 		return false
 	}
 
-	if p.Timestamp != nil && (input.Timestamp == nil && *p.Timestamp != *input.Timestamp) {
+	if p.Timestamp != nil && (input.Timestamp == nil || *p.Timestamp != *input.Timestamp) {
 		return false
 	}
 
-	if p.TracingId != nil && (input.TracingId == nil && *p.TracingId != *input.TracingId) {
+	if p.TracingId != nil && (input.TracingId == nil || *p.TracingId != *input.TracingId) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/syncmembers/predicates.go b/resource-manager/sql/2022-11-01-preview/syncmembers/predicates.go
index 9eada17780d..72491a390dc 100644
--- a/resource-manager/sql/2022-11-01-preview/syncmembers/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/syncmembers/predicates.go
@@ -9,7 +9,7 @@ type SyncFullSchemaPropertiesOperationPredicate struct {
 
 func (p SyncFullSchemaPropertiesOperationPredicate) Matches(input SyncFullSchemaProperties) bool {
 
-	if p.LastUpdateTime != nil && (input.LastUpdateTime == nil && *p.LastUpdateTime != *input.LastUpdateTime) {
+	if p.LastUpdateTime != nil && (input.LastUpdateTime == nil || *p.LastUpdateTime != *input.LastUpdateTime) {
 		return false
 	}
 
@@ -24,15 +24,15 @@ type SyncMemberOperationPredicate struct {
 
 func (p SyncMemberOperationPredicate) Matches(input SyncMember) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/timezones/predicates.go b/resource-manager/sql/2022-11-01-preview/timezones/predicates.go
index 418ea9ec9d5..7fcbdb82752 100644
--- a/resource-manager/sql/2022-11-01-preview/timezones/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/timezones/predicates.go
@@ -11,15 +11,15 @@ type TimeZoneOperationPredicate struct {
 
 func (p TimeZoneOperationPredicate) Matches(input TimeZone) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/transparentdataencryptions/predicates.go b/resource-manager/sql/2022-11-01-preview/transparentdataencryptions/predicates.go
index c17b78369cb..f312872d12a 100644
--- a/resource-manager/sql/2022-11-01-preview/transparentdataencryptions/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/transparentdataencryptions/predicates.go
@@ -11,15 +11,15 @@ type LogicalDatabaseTransparentDataEncryptionOperationPredicate struct {
 
 func (p LogicalDatabaseTransparentDataEncryptionOperationPredicate) Matches(input LogicalDatabaseTransparentDataEncryption) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/usages/predicates.go b/resource-manager/sql/2022-11-01-preview/usages/predicates.go
index bbcaf08d84d..38b0aa9b1f4 100644
--- a/resource-manager/sql/2022-11-01-preview/usages/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/usages/predicates.go
@@ -14,27 +14,27 @@ type UsageOperationPredicate struct {
 
 func (p UsageOperationPredicate) Matches(input Usage) bool {
 
-	if p.CurrentValue != nil && (input.CurrentValue == nil && *p.CurrentValue != *input.CurrentValue) {
+	if p.CurrentValue != nil && (input.CurrentValue == nil || *p.CurrentValue != *input.CurrentValue) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
-	if p.RequestedLimit != nil && (input.RequestedLimit == nil && *p.RequestedLimit != *input.RequestedLimit) {
+	if p.RequestedLimit != nil && (input.RequestedLimit == nil || *p.RequestedLimit != *input.RequestedLimit) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
-	if p.Unit != nil && (input.Unit == nil && *p.Unit != *input.Unit) {
+	if p.Unit != nil && (input.Unit == nil || *p.Unit != *input.Unit) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/virtualclusters/predicates.go b/resource-manager/sql/2022-11-01-preview/virtualclusters/predicates.go
index 79bf074352c..48542d3780f 100644
--- a/resource-manager/sql/2022-11-01-preview/virtualclusters/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/virtualclusters/predicates.go
@@ -12,7 +12,7 @@ type VirtualClusterOperationPredicate struct {
 
 func (p VirtualClusterOperationPredicate) Matches(input VirtualCluster) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p VirtualClusterOperationPredicate) Matches(input VirtualCluster) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/virtualnetworkrules/predicates.go b/resource-manager/sql/2022-11-01-preview/virtualnetworkrules/predicates.go
index 3050c3d8f64..9170201b8d5 100644
--- a/resource-manager/sql/2022-11-01-preview/virtualnetworkrules/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/virtualnetworkrules/predicates.go
@@ -11,15 +11,15 @@ type VirtualNetworkRuleOperationPredicate struct {
 
 func (p VirtualNetworkRuleOperationPredicate) Matches(input VirtualNetworkRule) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/workloadclassifiers/predicates.go b/resource-manager/sql/2022-11-01-preview/workloadclassifiers/predicates.go
index c3d0dd2850c..9058806d434 100644
--- a/resource-manager/sql/2022-11-01-preview/workloadclassifiers/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/workloadclassifiers/predicates.go
@@ -11,15 +11,15 @@ type WorkloadClassifierOperationPredicate struct {
 
 func (p WorkloadClassifierOperationPredicate) Matches(input WorkloadClassifier) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sql/2022-11-01-preview/workloadgroups/predicates.go b/resource-manager/sql/2022-11-01-preview/workloadgroups/predicates.go
index 5d9574fed44..3fa552a0da7 100644
--- a/resource-manager/sql/2022-11-01-preview/workloadgroups/predicates.go
+++ b/resource-manager/sql/2022-11-01-preview/workloadgroups/predicates.go
@@ -11,15 +11,15 @@ type WorkloadGroupOperationPredicate struct {
 
 func (p WorkloadGroupOperationPredicate) Matches(input WorkloadGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sqlvirtualmachine/2022-02-01/availabilitygrouplisteners/predicates.go b/resource-manager/sqlvirtualmachine/2022-02-01/availabilitygrouplisteners/predicates.go
index 60bfffa775a..fff382e98c7 100644
--- a/resource-manager/sqlvirtualmachine/2022-02-01/availabilitygrouplisteners/predicates.go
+++ b/resource-manager/sqlvirtualmachine/2022-02-01/availabilitygrouplisteners/predicates.go
@@ -11,15 +11,15 @@ type AvailabilityGroupListenerOperationPredicate struct {
 
 func (p AvailabilityGroupListenerOperationPredicate) Matches(input AvailabilityGroupListener) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sqlvirtualmachine/2022-02-01/sqlvirtualmachinegroups/predicates.go b/resource-manager/sqlvirtualmachine/2022-02-01/sqlvirtualmachinegroups/predicates.go
index 1eac3dc49d0..d3878f312b5 100644
--- a/resource-manager/sqlvirtualmachine/2022-02-01/sqlvirtualmachinegroups/predicates.go
+++ b/resource-manager/sqlvirtualmachine/2022-02-01/sqlvirtualmachinegroups/predicates.go
@@ -12,7 +12,7 @@ type SqlVirtualMachineGroupOperationPredicate struct {
 
 func (p SqlVirtualMachineGroupOperationPredicate) Matches(input SqlVirtualMachineGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SqlVirtualMachineGroupOperationPredicate) Matches(input SqlVirtualMachin
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/sqlvirtualmachine/2022-02-01/sqlvirtualmachines/predicates.go b/resource-manager/sqlvirtualmachine/2022-02-01/sqlvirtualmachines/predicates.go
index 07b9bab5bc1..1fd5e8f748c 100644
--- a/resource-manager/sqlvirtualmachine/2022-02-01/sqlvirtualmachines/predicates.go
+++ b/resource-manager/sqlvirtualmachine/2022-02-01/sqlvirtualmachines/predicates.go
@@ -12,7 +12,7 @@ type SqlVirtualMachineOperationPredicate struct {
 
 func (p SqlVirtualMachineOperationPredicate) Matches(input SqlVirtualMachine) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SqlVirtualMachineOperationPredicate) Matches(input SqlVirtualMachine) bo
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storage/2022-05-01/blobcontainers/predicates.go b/resource-manager/storage/2022-05-01/blobcontainers/predicates.go
index 1d37cb51475..b31d0087277 100644
--- a/resource-manager/storage/2022-05-01/blobcontainers/predicates.go
+++ b/resource-manager/storage/2022-05-01/blobcontainers/predicates.go
@@ -12,19 +12,19 @@ type ListContainerItemOperationPredicate struct {
 
 func (p ListContainerItemOperationPredicate) Matches(input ListContainerItem) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storage/2022-05-01/deletedaccounts/predicates.go b/resource-manager/storage/2022-05-01/deletedaccounts/predicates.go
index 25e7a83d33e..7505756d8f2 100644
--- a/resource-manager/storage/2022-05-01/deletedaccounts/predicates.go
+++ b/resource-manager/storage/2022-05-01/deletedaccounts/predicates.go
@@ -11,15 +11,15 @@ type DeletedAccountOperationPredicate struct {
 
 func (p DeletedAccountOperationPredicate) Matches(input DeletedAccount) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storage/2022-05-01/encryptionscopes/predicates.go b/resource-manager/storage/2022-05-01/encryptionscopes/predicates.go
index 60f09b83b1e..f44125b8a22 100644
--- a/resource-manager/storage/2022-05-01/encryptionscopes/predicates.go
+++ b/resource-manager/storage/2022-05-01/encryptionscopes/predicates.go
@@ -11,15 +11,15 @@ type EncryptionScopeOperationPredicate struct {
 
 func (p EncryptionScopeOperationPredicate) Matches(input EncryptionScope) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storage/2022-05-01/fileshares/predicates.go b/resource-manager/storage/2022-05-01/fileshares/predicates.go
index c3826cd10c9..55bb738a2ab 100644
--- a/resource-manager/storage/2022-05-01/fileshares/predicates.go
+++ b/resource-manager/storage/2022-05-01/fileshares/predicates.go
@@ -12,19 +12,19 @@ type FileShareItemOperationPredicate struct {
 
 func (p FileShareItemOperationPredicate) Matches(input FileShareItem) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storage/2022-05-01/queueservice/predicates.go b/resource-manager/storage/2022-05-01/queueservice/predicates.go
index cb2efdbe363..51301a00a4a 100644
--- a/resource-manager/storage/2022-05-01/queueservice/predicates.go
+++ b/resource-manager/storage/2022-05-01/queueservice/predicates.go
@@ -11,15 +11,15 @@ type ListQueueOperationPredicate struct {
 
 func (p ListQueueOperationPredicate) Matches(input ListQueue) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storage/2022-05-01/storageaccounts/predicates.go b/resource-manager/storage/2022-05-01/storageaccounts/predicates.go
index bdcca79006b..52fd6e674e6 100644
--- a/resource-manager/storage/2022-05-01/storageaccounts/predicates.go
+++ b/resource-manager/storage/2022-05-01/storageaccounts/predicates.go
@@ -12,7 +12,7 @@ type StorageAccountOperationPredicate struct {
 
 func (p StorageAccountOperationPredicate) Matches(input StorageAccount) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p StorageAccountOperationPredicate) Matches(input StorageAccount) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storage/2022-05-01/tableservice/predicates.go b/resource-manager/storage/2022-05-01/tableservice/predicates.go
index aeb6ae4a692..b05c3c34be5 100644
--- a/resource-manager/storage/2022-05-01/tableservice/predicates.go
+++ b/resource-manager/storage/2022-05-01/tableservice/predicates.go
@@ -11,15 +11,15 @@ type TableOperationPredicate struct {
 
 func (p TableOperationPredicate) Matches(input Table) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storage/2022-09-01/blobcontainers/predicates.go b/resource-manager/storage/2022-09-01/blobcontainers/predicates.go
index 1d37cb51475..b31d0087277 100644
--- a/resource-manager/storage/2022-09-01/blobcontainers/predicates.go
+++ b/resource-manager/storage/2022-09-01/blobcontainers/predicates.go
@@ -12,19 +12,19 @@ type ListContainerItemOperationPredicate struct {
 
 func (p ListContainerItemOperationPredicate) Matches(input ListContainerItem) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storage/2022-09-01/deletedaccounts/predicates.go b/resource-manager/storage/2022-09-01/deletedaccounts/predicates.go
index 25e7a83d33e..7505756d8f2 100644
--- a/resource-manager/storage/2022-09-01/deletedaccounts/predicates.go
+++ b/resource-manager/storage/2022-09-01/deletedaccounts/predicates.go
@@ -11,15 +11,15 @@ type DeletedAccountOperationPredicate struct {
 
 func (p DeletedAccountOperationPredicate) Matches(input DeletedAccount) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storage/2022-09-01/encryptionscopes/predicates.go b/resource-manager/storage/2022-09-01/encryptionscopes/predicates.go
index 60f09b83b1e..f44125b8a22 100644
--- a/resource-manager/storage/2022-09-01/encryptionscopes/predicates.go
+++ b/resource-manager/storage/2022-09-01/encryptionscopes/predicates.go
@@ -11,15 +11,15 @@ type EncryptionScopeOperationPredicate struct {
 
 func (p EncryptionScopeOperationPredicate) Matches(input EncryptionScope) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storage/2022-09-01/fileshares/predicates.go b/resource-manager/storage/2022-09-01/fileshares/predicates.go
index c3826cd10c9..55bb738a2ab 100644
--- a/resource-manager/storage/2022-09-01/fileshares/predicates.go
+++ b/resource-manager/storage/2022-09-01/fileshares/predicates.go
@@ -12,19 +12,19 @@ type FileShareItemOperationPredicate struct {
 
 func (p FileShareItemOperationPredicate) Matches(input FileShareItem) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storage/2022-09-01/queueservice/predicates.go b/resource-manager/storage/2022-09-01/queueservice/predicates.go
index cb2efdbe363..51301a00a4a 100644
--- a/resource-manager/storage/2022-09-01/queueservice/predicates.go
+++ b/resource-manager/storage/2022-09-01/queueservice/predicates.go
@@ -11,15 +11,15 @@ type ListQueueOperationPredicate struct {
 
 func (p ListQueueOperationPredicate) Matches(input ListQueue) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storage/2022-09-01/storageaccounts/predicates.go b/resource-manager/storage/2022-09-01/storageaccounts/predicates.go
index bdcca79006b..52fd6e674e6 100644
--- a/resource-manager/storage/2022-09-01/storageaccounts/predicates.go
+++ b/resource-manager/storage/2022-09-01/storageaccounts/predicates.go
@@ -12,7 +12,7 @@ type StorageAccountOperationPredicate struct {
 
 func (p StorageAccountOperationPredicate) Matches(input StorageAccount) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p StorageAccountOperationPredicate) Matches(input StorageAccount) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storage/2022-09-01/tableservice/predicates.go b/resource-manager/storage/2022-09-01/tableservice/predicates.go
index aeb6ae4a692..b05c3c34be5 100644
--- a/resource-manager/storage/2022-09-01/tableservice/predicates.go
+++ b/resource-manager/storage/2022-09-01/tableservice/predicates.go
@@ -11,15 +11,15 @@ type TableOperationPredicate struct {
 
 func (p TableOperationPredicate) Matches(input Table) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storage/2023-01-01/blobcontainers/predicates.go b/resource-manager/storage/2023-01-01/blobcontainers/predicates.go
index 1d37cb51475..b31d0087277 100644
--- a/resource-manager/storage/2023-01-01/blobcontainers/predicates.go
+++ b/resource-manager/storage/2023-01-01/blobcontainers/predicates.go
@@ -12,19 +12,19 @@ type ListContainerItemOperationPredicate struct {
 
 func (p ListContainerItemOperationPredicate) Matches(input ListContainerItem) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storage/2023-01-01/deletedaccounts/predicates.go b/resource-manager/storage/2023-01-01/deletedaccounts/predicates.go
index 25e7a83d33e..7505756d8f2 100644
--- a/resource-manager/storage/2023-01-01/deletedaccounts/predicates.go
+++ b/resource-manager/storage/2023-01-01/deletedaccounts/predicates.go
@@ -11,15 +11,15 @@ type DeletedAccountOperationPredicate struct {
 
 func (p DeletedAccountOperationPredicate) Matches(input DeletedAccount) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storage/2023-01-01/encryptionscopes/predicates.go b/resource-manager/storage/2023-01-01/encryptionscopes/predicates.go
index 60f09b83b1e..f44125b8a22 100644
--- a/resource-manager/storage/2023-01-01/encryptionscopes/predicates.go
+++ b/resource-manager/storage/2023-01-01/encryptionscopes/predicates.go
@@ -11,15 +11,15 @@ type EncryptionScopeOperationPredicate struct {
 
 func (p EncryptionScopeOperationPredicate) Matches(input EncryptionScope) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storage/2023-01-01/fileshares/predicates.go b/resource-manager/storage/2023-01-01/fileshares/predicates.go
index c3826cd10c9..55bb738a2ab 100644
--- a/resource-manager/storage/2023-01-01/fileshares/predicates.go
+++ b/resource-manager/storage/2023-01-01/fileshares/predicates.go
@@ -12,19 +12,19 @@ type FileShareItemOperationPredicate struct {
 
 func (p FileShareItemOperationPredicate) Matches(input FileShareItem) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storage/2023-01-01/queueservice/predicates.go b/resource-manager/storage/2023-01-01/queueservice/predicates.go
index cb2efdbe363..51301a00a4a 100644
--- a/resource-manager/storage/2023-01-01/queueservice/predicates.go
+++ b/resource-manager/storage/2023-01-01/queueservice/predicates.go
@@ -11,15 +11,15 @@ type ListQueueOperationPredicate struct {
 
 func (p ListQueueOperationPredicate) Matches(input ListQueue) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storage/2023-01-01/storageaccounts/predicates.go b/resource-manager/storage/2023-01-01/storageaccounts/predicates.go
index bdcca79006b..52fd6e674e6 100644
--- a/resource-manager/storage/2023-01-01/storageaccounts/predicates.go
+++ b/resource-manager/storage/2023-01-01/storageaccounts/predicates.go
@@ -12,7 +12,7 @@ type StorageAccountOperationPredicate struct {
 
 func (p StorageAccountOperationPredicate) Matches(input StorageAccount) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p StorageAccountOperationPredicate) Matches(input StorageAccount) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storage/2023-01-01/tableservice/predicates.go b/resource-manager/storage/2023-01-01/tableservice/predicates.go
index aeb6ae4a692..b05c3c34be5 100644
--- a/resource-manager/storage/2023-01-01/tableservice/predicates.go
+++ b/resource-manager/storage/2023-01-01/tableservice/predicates.go
@@ -11,15 +11,15 @@ type TableOperationPredicate struct {
 
 func (p TableOperationPredicate) Matches(input Table) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storagecache/2023-01-01/ascusages/predicates.go b/resource-manager/storagecache/2023-01-01/ascusages/predicates.go
index 2fbac0a8445..d17d6ebf577 100644
--- a/resource-manager/storagecache/2023-01-01/ascusages/predicates.go
+++ b/resource-manager/storagecache/2023-01-01/ascusages/predicates.go
@@ -11,15 +11,15 @@ type ResourceUsageOperationPredicate struct {
 
 func (p ResourceUsageOperationPredicate) Matches(input ResourceUsage) bool {
 
-	if p.CurrentValue != nil && (input.CurrentValue == nil && *p.CurrentValue != *input.CurrentValue) {
+	if p.CurrentValue != nil && (input.CurrentValue == nil || *p.CurrentValue != *input.CurrentValue) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
-	if p.Unit != nil && (input.Unit == nil && *p.Unit != *input.Unit) {
+	if p.Unit != nil && (input.Unit == nil || *p.Unit != *input.Unit) {
 		return false
 	}
 
diff --git a/resource-manager/storagecache/2023-01-01/caches/predicates.go b/resource-manager/storagecache/2023-01-01/caches/predicates.go
index 6bd896779e5..67fc4aa4f86 100644
--- a/resource-manager/storagecache/2023-01-01/caches/predicates.go
+++ b/resource-manager/storagecache/2023-01-01/caches/predicates.go
@@ -12,19 +12,19 @@ type CacheOperationPredicate struct {
 
 func (p CacheOperationPredicate) Matches(input Cache) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storagecache/2023-01-01/skus/predicates.go b/resource-manager/storagecache/2023-01-01/skus/predicates.go
index d3c730b4e5b..4d072f2f035 100644
--- a/resource-manager/storagecache/2023-01-01/skus/predicates.go
+++ b/resource-manager/storagecache/2023-01-01/skus/predicates.go
@@ -10,11 +10,11 @@ type ResourceSkuOperationPredicate struct {
 
 func (p ResourceSkuOperationPredicate) Matches(input ResourceSku) bool {
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
diff --git a/resource-manager/storagecache/2023-01-01/storagetargets/predicates.go b/resource-manager/storagecache/2023-01-01/storagetargets/predicates.go
index 44818897567..30c9e142fd1 100644
--- a/resource-manager/storagecache/2023-01-01/storagetargets/predicates.go
+++ b/resource-manager/storagecache/2023-01-01/storagetargets/predicates.go
@@ -12,19 +12,19 @@ type StorageTargetOperationPredicate struct {
 
 func (p StorageTargetOperationPredicate) Matches(input StorageTarget) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storagecache/2023-01-01/usagemodels/predicates.go b/resource-manager/storagecache/2023-01-01/usagemodels/predicates.go
index a95572dc942..7e151181aec 100644
--- a/resource-manager/storagecache/2023-01-01/usagemodels/predicates.go
+++ b/resource-manager/storagecache/2023-01-01/usagemodels/predicates.go
@@ -10,11 +10,11 @@ type UsageModelOperationPredicate struct {
 
 func (p UsageModelOperationPredicate) Matches(input UsageModel) bool {
 
-	if p.ModelName != nil && (input.ModelName == nil && *p.ModelName != *input.ModelName) {
+	if p.ModelName != nil && (input.ModelName == nil || *p.ModelName != *input.ModelName) {
 		return false
 	}
 
-	if p.TargetType != nil && (input.TargetType == nil && *p.TargetType != *input.TargetType) {
+	if p.TargetType != nil && (input.TargetType == nil || *p.TargetType != *input.TargetType) {
 		return false
 	}
 
diff --git a/resource-manager/storagecache/2023-05-01/amlfilesystems/predicates.go b/resource-manager/storagecache/2023-05-01/amlfilesystems/predicates.go
index 88209e5c776..945d416104a 100644
--- a/resource-manager/storagecache/2023-05-01/amlfilesystems/predicates.go
+++ b/resource-manager/storagecache/2023-05-01/amlfilesystems/predicates.go
@@ -12,7 +12,7 @@ type AmlFilesystemOperationPredicate struct {
 
 func (p AmlFilesystemOperationPredicate) Matches(input AmlFilesystem) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p AmlFilesystemOperationPredicate) Matches(input AmlFilesystem) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storagecache/2023-05-01/ascusages/predicates.go b/resource-manager/storagecache/2023-05-01/ascusages/predicates.go
index 2fbac0a8445..d17d6ebf577 100644
--- a/resource-manager/storagecache/2023-05-01/ascusages/predicates.go
+++ b/resource-manager/storagecache/2023-05-01/ascusages/predicates.go
@@ -11,15 +11,15 @@ type ResourceUsageOperationPredicate struct {
 
 func (p ResourceUsageOperationPredicate) Matches(input ResourceUsage) bool {
 
-	if p.CurrentValue != nil && (input.CurrentValue == nil && *p.CurrentValue != *input.CurrentValue) {
+	if p.CurrentValue != nil && (input.CurrentValue == nil || *p.CurrentValue != *input.CurrentValue) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
-	if p.Unit != nil && (input.Unit == nil && *p.Unit != *input.Unit) {
+	if p.Unit != nil && (input.Unit == nil || *p.Unit != *input.Unit) {
 		return false
 	}
 
diff --git a/resource-manager/storagecache/2023-05-01/caches/predicates.go b/resource-manager/storagecache/2023-05-01/caches/predicates.go
index 6bd896779e5..67fc4aa4f86 100644
--- a/resource-manager/storagecache/2023-05-01/caches/predicates.go
+++ b/resource-manager/storagecache/2023-05-01/caches/predicates.go
@@ -12,19 +12,19 @@ type CacheOperationPredicate struct {
 
 func (p CacheOperationPredicate) Matches(input Cache) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storagecache/2023-05-01/skus/predicates.go b/resource-manager/storagecache/2023-05-01/skus/predicates.go
index d3c730b4e5b..4d072f2f035 100644
--- a/resource-manager/storagecache/2023-05-01/skus/predicates.go
+++ b/resource-manager/storagecache/2023-05-01/skus/predicates.go
@@ -10,11 +10,11 @@ type ResourceSkuOperationPredicate struct {
 
 func (p ResourceSkuOperationPredicate) Matches(input ResourceSku) bool {
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
diff --git a/resource-manager/storagecache/2023-05-01/storagetargets/predicates.go b/resource-manager/storagecache/2023-05-01/storagetargets/predicates.go
index 44818897567..30c9e142fd1 100644
--- a/resource-manager/storagecache/2023-05-01/storagetargets/predicates.go
+++ b/resource-manager/storagecache/2023-05-01/storagetargets/predicates.go
@@ -12,19 +12,19 @@ type StorageTargetOperationPredicate struct {
 
 func (p StorageTargetOperationPredicate) Matches(input StorageTarget) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storagecache/2023-05-01/usagemodels/predicates.go b/resource-manager/storagecache/2023-05-01/usagemodels/predicates.go
index a95572dc942..7e151181aec 100644
--- a/resource-manager/storagecache/2023-05-01/usagemodels/predicates.go
+++ b/resource-manager/storagecache/2023-05-01/usagemodels/predicates.go
@@ -10,11 +10,11 @@ type UsageModelOperationPredicate struct {
 
 func (p UsageModelOperationPredicate) Matches(input UsageModel) bool {
 
-	if p.ModelName != nil && (input.ModelName == nil && *p.ModelName != *input.ModelName) {
+	if p.ModelName != nil && (input.ModelName == nil || *p.ModelName != *input.ModelName) {
 		return false
 	}
 
-	if p.TargetType != nil && (input.TargetType == nil && *p.TargetType != *input.TargetType) {
+	if p.TargetType != nil && (input.TargetType == nil || *p.TargetType != *input.TargetType) {
 		return false
 	}
 
diff --git a/resource-manager/storagemover/2023-03-01/agents/predicates.go b/resource-manager/storagemover/2023-03-01/agents/predicates.go
index 98e30d4c405..73d592a1c21 100644
--- a/resource-manager/storagemover/2023-03-01/agents/predicates.go
+++ b/resource-manager/storagemover/2023-03-01/agents/predicates.go
@@ -11,15 +11,15 @@ type AgentOperationPredicate struct {
 
 func (p AgentOperationPredicate) Matches(input Agent) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storagemover/2023-03-01/endpoints/predicates.go b/resource-manager/storagemover/2023-03-01/endpoints/predicates.go
index 968958292ac..9938351cd51 100644
--- a/resource-manager/storagemover/2023-03-01/endpoints/predicates.go
+++ b/resource-manager/storagemover/2023-03-01/endpoints/predicates.go
@@ -11,15 +11,15 @@ type EndpointOperationPredicate struct {
 
 func (p EndpointOperationPredicate) Matches(input Endpoint) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storagemover/2023-03-01/jobdefinitions/predicates.go b/resource-manager/storagemover/2023-03-01/jobdefinitions/predicates.go
index 4a068ea7762..050c43bfac9 100644
--- a/resource-manager/storagemover/2023-03-01/jobdefinitions/predicates.go
+++ b/resource-manager/storagemover/2023-03-01/jobdefinitions/predicates.go
@@ -11,15 +11,15 @@ type JobDefinitionOperationPredicate struct {
 
 func (p JobDefinitionOperationPredicate) Matches(input JobDefinition) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storagemover/2023-03-01/jobruns/predicates.go b/resource-manager/storagemover/2023-03-01/jobruns/predicates.go
index be16e406850..45caa72974a 100644
--- a/resource-manager/storagemover/2023-03-01/jobruns/predicates.go
+++ b/resource-manager/storagemover/2023-03-01/jobruns/predicates.go
@@ -11,15 +11,15 @@ type JobRunOperationPredicate struct {
 
 func (p JobRunOperationPredicate) Matches(input JobRun) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storagemover/2023-03-01/projects/predicates.go b/resource-manager/storagemover/2023-03-01/projects/predicates.go
index eda15dd637d..84d215fc4cd 100644
--- a/resource-manager/storagemover/2023-03-01/projects/predicates.go
+++ b/resource-manager/storagemover/2023-03-01/projects/predicates.go
@@ -11,15 +11,15 @@ type ProjectOperationPredicate struct {
 
 func (p ProjectOperationPredicate) Matches(input Project) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storagemover/2023-03-01/storagemovers/predicates.go b/resource-manager/storagemover/2023-03-01/storagemovers/predicates.go
index 7da2e9f2fe2..5d8b6badc94 100644
--- a/resource-manager/storagemover/2023-03-01/storagemovers/predicates.go
+++ b/resource-manager/storagemover/2023-03-01/storagemovers/predicates.go
@@ -12,7 +12,7 @@ type StorageMoverOperationPredicate struct {
 
 func (p StorageMoverOperationPredicate) Matches(input StorageMover) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p StorageMoverOperationPredicate) Matches(input StorageMover) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storagepool/2021-08-01/diskpools/predicates.go b/resource-manager/storagepool/2021-08-01/diskpools/predicates.go
index 57abdccff5d..20f67c0afaa 100644
--- a/resource-manager/storagepool/2021-08-01/diskpools/predicates.go
+++ b/resource-manager/storagepool/2021-08-01/diskpools/predicates.go
@@ -13,7 +13,7 @@ type DiskPoolOperationPredicate struct {
 
 func (p DiskPoolOperationPredicate) Matches(input DiskPool) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -21,15 +21,15 @@ func (p DiskPoolOperationPredicate) Matches(input DiskPool) bool {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -42,7 +42,7 @@ type OutboundEnvironmentEndpointOperationPredicate struct {
 
 func (p OutboundEnvironmentEndpointOperationPredicate) Matches(input OutboundEnvironmentEndpoint) bool {
 
-	if p.Category != nil && (input.Category == nil && *p.Category != *input.Category) {
+	if p.Category != nil && (input.Category == nil || *p.Category != *input.Category) {
 		return false
 	}
 
diff --git a/resource-manager/storagepool/2021-08-01/iscsitargets/predicates.go b/resource-manager/storagepool/2021-08-01/iscsitargets/predicates.go
index b179e77a6c7..23164b6dbb9 100644
--- a/resource-manager/storagepool/2021-08-01/iscsitargets/predicates.go
+++ b/resource-manager/storagepool/2021-08-01/iscsitargets/predicates.go
@@ -12,19 +12,19 @@ type IscsiTargetOperationPredicate struct {
 
 func (p IscsiTargetOperationPredicate) Matches(input IscsiTarget) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.ManagedBy != nil && (input.ManagedBy == nil && *p.ManagedBy != *input.ManagedBy) {
+	if p.ManagedBy != nil && (input.ManagedBy == nil || *p.ManagedBy != *input.ManagedBy) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/storagepool/2021-08-01/resourceskus/predicates.go b/resource-manager/storagepool/2021-08-01/resourceskus/predicates.go
index 410d4844d4c..9b8765a7e57 100644
--- a/resource-manager/storagepool/2021-08-01/resourceskus/predicates.go
+++ b/resource-manager/storagepool/2021-08-01/resourceskus/predicates.go
@@ -12,19 +12,19 @@ type ResourceSkuInfoOperationPredicate struct {
 
 func (p ResourceSkuInfoOperationPredicate) Matches(input ResourceSkuInfo) bool {
 
-	if p.ApiVersion != nil && (input.ApiVersion == nil && *p.ApiVersion != *input.ApiVersion) {
+	if p.ApiVersion != nil && (input.ApiVersion == nil || *p.ApiVersion != *input.ApiVersion) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
-	if p.Tier != nil && (input.Tier == nil && *p.Tier != *input.Tier) {
+	if p.Tier != nil && (input.Tier == nil || *p.Tier != *input.Tier) {
 		return false
 	}
 
diff --git a/resource-manager/streamanalytics/2020-03-01/clusters/predicates.go b/resource-manager/streamanalytics/2020-03-01/clusters/predicates.go
index 7db8b2953ce..cf7beef404e 100644
--- a/resource-manager/streamanalytics/2020-03-01/clusters/predicates.go
+++ b/resource-manager/streamanalytics/2020-03-01/clusters/predicates.go
@@ -13,23 +13,23 @@ type ClusterOperationPredicate struct {
 
 func (p ClusterOperationPredicate) Matches(input Cluster) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -43,11 +43,11 @@ type ClusterJobOperationPredicate struct {
 
 func (p ClusterJobOperationPredicate) Matches(input ClusterJob) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.StreamingUnits != nil && (input.StreamingUnits == nil && *p.StreamingUnits != *input.StreamingUnits) {
+	if p.StreamingUnits != nil && (input.StreamingUnits == nil || *p.StreamingUnits != *input.StreamingUnits) {
 		return false
 	}
 
diff --git a/resource-manager/streamanalytics/2020-03-01/functions/predicates.go b/resource-manager/streamanalytics/2020-03-01/functions/predicates.go
index 310fdffcd7b..78002c325b8 100644
--- a/resource-manager/streamanalytics/2020-03-01/functions/predicates.go
+++ b/resource-manager/streamanalytics/2020-03-01/functions/predicates.go
@@ -11,15 +11,15 @@ type FunctionOperationPredicate struct {
 
 func (p FunctionOperationPredicate) Matches(input Function) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/streamanalytics/2020-03-01/inputs/predicates.go b/resource-manager/streamanalytics/2020-03-01/inputs/predicates.go
index 9f74028b916..18eb099b681 100644
--- a/resource-manager/streamanalytics/2020-03-01/inputs/predicates.go
+++ b/resource-manager/streamanalytics/2020-03-01/inputs/predicates.go
@@ -11,15 +11,15 @@ type InputOperationPredicate struct {
 
 func (p InputOperationPredicate) Matches(input Input) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/streamanalytics/2020-03-01/outputs/predicates.go b/resource-manager/streamanalytics/2020-03-01/outputs/predicates.go
index 90b8ce8c29b..4c9988f5115 100644
--- a/resource-manager/streamanalytics/2020-03-01/outputs/predicates.go
+++ b/resource-manager/streamanalytics/2020-03-01/outputs/predicates.go
@@ -11,15 +11,15 @@ type OutputOperationPredicate struct {
 
 func (p OutputOperationPredicate) Matches(input Output) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/streamanalytics/2020-03-01/privateendpoints/predicates.go b/resource-manager/streamanalytics/2020-03-01/privateendpoints/predicates.go
index ac335bcecfa..ad466daf38a 100644
--- a/resource-manager/streamanalytics/2020-03-01/privateendpoints/predicates.go
+++ b/resource-manager/streamanalytics/2020-03-01/privateendpoints/predicates.go
@@ -12,19 +12,19 @@ type PrivateEndpointOperationPredicate struct {
 
 func (p PrivateEndpointOperationPredicate) Matches(input PrivateEndpoint) bool {
 
-	if p.Etag != nil && (input.Etag == nil && *p.Etag != *input.Etag) {
+	if p.Etag != nil && (input.Etag == nil || *p.Etag != *input.Etag) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/streamanalytics/2020-03-01/streamingjobs/predicates.go b/resource-manager/streamanalytics/2020-03-01/streamingjobs/predicates.go
index b4d27a57e02..7eece302a67 100644
--- a/resource-manager/streamanalytics/2020-03-01/streamingjobs/predicates.go
+++ b/resource-manager/streamanalytics/2020-03-01/streamingjobs/predicates.go
@@ -12,19 +12,19 @@ type StreamingJobOperationPredicate struct {
 
 func (p StreamingJobOperationPredicate) Matches(input StreamingJob) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/streamanalytics/2021-10-01-preview/functions/predicates.go b/resource-manager/streamanalytics/2021-10-01-preview/functions/predicates.go
index 310fdffcd7b..78002c325b8 100644
--- a/resource-manager/streamanalytics/2021-10-01-preview/functions/predicates.go
+++ b/resource-manager/streamanalytics/2021-10-01-preview/functions/predicates.go
@@ -11,15 +11,15 @@ type FunctionOperationPredicate struct {
 
 func (p FunctionOperationPredicate) Matches(input Function) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/streamanalytics/2021-10-01-preview/inputs/predicates.go b/resource-manager/streamanalytics/2021-10-01-preview/inputs/predicates.go
index 9f74028b916..18eb099b681 100644
--- a/resource-manager/streamanalytics/2021-10-01-preview/inputs/predicates.go
+++ b/resource-manager/streamanalytics/2021-10-01-preview/inputs/predicates.go
@@ -11,15 +11,15 @@ type InputOperationPredicate struct {
 
 func (p InputOperationPredicate) Matches(input Input) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/streamanalytics/2021-10-01-preview/outputs/predicates.go b/resource-manager/streamanalytics/2021-10-01-preview/outputs/predicates.go
index 90b8ce8c29b..4c9988f5115 100644
--- a/resource-manager/streamanalytics/2021-10-01-preview/outputs/predicates.go
+++ b/resource-manager/streamanalytics/2021-10-01-preview/outputs/predicates.go
@@ -11,15 +11,15 @@ type OutputOperationPredicate struct {
 
 func (p OutputOperationPredicate) Matches(input Output) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/streamanalytics/2021-10-01-preview/streamingjobs/predicates.go b/resource-manager/streamanalytics/2021-10-01-preview/streamingjobs/predicates.go
index f126ff5f499..a260e6fa2e7 100644
--- a/resource-manager/streamanalytics/2021-10-01-preview/streamingjobs/predicates.go
+++ b/resource-manager/streamanalytics/2021-10-01-preview/streamingjobs/predicates.go
@@ -20,19 +20,19 @@ type StreamingJobOperationPredicate struct {
 
 func (p StreamingJobOperationPredicate) Matches(input StreamingJob) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/subscription/2021-10-01/subscriptions/predicates.go b/resource-manager/subscription/2021-10-01/subscriptions/predicates.go
index d6bbb3cb5f1..691009ca2ae 100644
--- a/resource-manager/subscription/2021-10-01/subscriptions/predicates.go
+++ b/resource-manager/subscription/2021-10-01/subscriptions/predicates.go
@@ -11,15 +11,15 @@ type GetTenantPolicyResponseOperationPredicate struct {
 
 func (p GetTenantPolicyResponseOperationPredicate) Matches(input GetTenantPolicyResponse) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/videoanalyzer/2021-05-01-preview/edgemodules/predicates.go b/resource-manager/videoanalyzer/2021-05-01-preview/edgemodules/predicates.go
index 4192b164480..5962467106d 100644
--- a/resource-manager/videoanalyzer/2021-05-01-preview/edgemodules/predicates.go
+++ b/resource-manager/videoanalyzer/2021-05-01-preview/edgemodules/predicates.go
@@ -11,15 +11,15 @@ type EdgeModuleEntityOperationPredicate struct {
 
 func (p EdgeModuleEntityOperationPredicate) Matches(input EdgeModuleEntity) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/videoanalyzer/2021-05-01-preview/videos/predicates.go b/resource-manager/videoanalyzer/2021-05-01-preview/videos/predicates.go
index 0bc45c9bf65..a84fc28f96b 100644
--- a/resource-manager/videoanalyzer/2021-05-01-preview/videos/predicates.go
+++ b/resource-manager/videoanalyzer/2021-05-01-preview/videos/predicates.go
@@ -11,15 +11,15 @@ type AccessPolicyEntityOperationPredicate struct {
 
 func (p AccessPolicyEntityOperationPredicate) Matches(input AccessPolicyEntity) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type VideoEntityOperationPredicate struct {
 
 func (p VideoEntityOperationPredicate) Matches(input VideoEntity) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/vmware/2022-05-01/addons/predicates.go b/resource-manager/vmware/2022-05-01/addons/predicates.go
index 3fdfca4d8fb..d09370b08ea 100644
--- a/resource-manager/vmware/2022-05-01/addons/predicates.go
+++ b/resource-manager/vmware/2022-05-01/addons/predicates.go
@@ -11,15 +11,15 @@ type AddonOperationPredicate struct {
 
 func (p AddonOperationPredicate) Matches(input Addon) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/vmware/2022-05-01/authorizations/predicates.go b/resource-manager/vmware/2022-05-01/authorizations/predicates.go
index 947f246da62..802acf1ef84 100644
--- a/resource-manager/vmware/2022-05-01/authorizations/predicates.go
+++ b/resource-manager/vmware/2022-05-01/authorizations/predicates.go
@@ -11,15 +11,15 @@ type ExpressRouteAuthorizationOperationPredicate struct {
 
 func (p ExpressRouteAuthorizationOperationPredicate) Matches(input ExpressRouteAuthorization) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/vmware/2022-05-01/cloudlinks/predicates.go b/resource-manager/vmware/2022-05-01/cloudlinks/predicates.go
index d0d4db43eae..1285f3ff4d0 100644
--- a/resource-manager/vmware/2022-05-01/cloudlinks/predicates.go
+++ b/resource-manager/vmware/2022-05-01/cloudlinks/predicates.go
@@ -11,15 +11,15 @@ type CloudLinkOperationPredicate struct {
 
 func (p CloudLinkOperationPredicate) Matches(input CloudLink) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/vmware/2022-05-01/clusters/predicates.go b/resource-manager/vmware/2022-05-01/clusters/predicates.go
index ed172202edb..14b9eb1b257 100644
--- a/resource-manager/vmware/2022-05-01/clusters/predicates.go
+++ b/resource-manager/vmware/2022-05-01/clusters/predicates.go
@@ -11,15 +11,15 @@ type ClusterOperationPredicate struct {
 
 func (p ClusterOperationPredicate) Matches(input Cluster) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/vmware/2022-05-01/datastores/predicates.go b/resource-manager/vmware/2022-05-01/datastores/predicates.go
index 1051953b4f2..0b4d864c4d7 100644
--- a/resource-manager/vmware/2022-05-01/datastores/predicates.go
+++ b/resource-manager/vmware/2022-05-01/datastores/predicates.go
@@ -11,15 +11,15 @@ type DatastoreOperationPredicate struct {
 
 func (p DatastoreOperationPredicate) Matches(input Datastore) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/vmware/2022-05-01/globalreachconnections/predicates.go b/resource-manager/vmware/2022-05-01/globalreachconnections/predicates.go
index bd49a9bd2d5..48f23f0c0c5 100644
--- a/resource-manager/vmware/2022-05-01/globalreachconnections/predicates.go
+++ b/resource-manager/vmware/2022-05-01/globalreachconnections/predicates.go
@@ -11,15 +11,15 @@ type GlobalReachConnectionOperationPredicate struct {
 
 func (p GlobalReachConnectionOperationPredicate) Matches(input GlobalReachConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/vmware/2022-05-01/hcxenterprisesites/predicates.go b/resource-manager/vmware/2022-05-01/hcxenterprisesites/predicates.go
index 6c53cbae464..7306b8c5e1e 100644
--- a/resource-manager/vmware/2022-05-01/hcxenterprisesites/predicates.go
+++ b/resource-manager/vmware/2022-05-01/hcxenterprisesites/predicates.go
@@ -11,15 +11,15 @@ type HcxEnterpriseSiteOperationPredicate struct {
 
 func (p HcxEnterpriseSiteOperationPredicate) Matches(input HcxEnterpriseSite) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/vmware/2022-05-01/placementpolicies/predicates.go b/resource-manager/vmware/2022-05-01/placementpolicies/predicates.go
index d2c632aa2dc..4b23bb58c41 100644
--- a/resource-manager/vmware/2022-05-01/placementpolicies/predicates.go
+++ b/resource-manager/vmware/2022-05-01/placementpolicies/predicates.go
@@ -11,15 +11,15 @@ type PlacementPolicyOperationPredicate struct {
 
 func (p PlacementPolicyOperationPredicate) Matches(input PlacementPolicy) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/vmware/2022-05-01/privateclouds/predicates.go b/resource-manager/vmware/2022-05-01/privateclouds/predicates.go
index 68eefcec199..900b96f9d6f 100644
--- a/resource-manager/vmware/2022-05-01/privateclouds/predicates.go
+++ b/resource-manager/vmware/2022-05-01/privateclouds/predicates.go
@@ -12,7 +12,7 @@ type PrivateCloudOperationPredicate struct {
 
 func (p PrivateCloudOperationPredicate) Matches(input PrivateCloud) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p PrivateCloudOperationPredicate) Matches(input PrivateCloud) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/vmware/2022-05-01/scripts/predicates.go b/resource-manager/vmware/2022-05-01/scripts/predicates.go
index 27a5b9d17cb..16ee7dc8f28 100644
--- a/resource-manager/vmware/2022-05-01/scripts/predicates.go
+++ b/resource-manager/vmware/2022-05-01/scripts/predicates.go
@@ -11,15 +11,15 @@ type ScriptCmdletOperationPredicate struct {
 
 func (p ScriptCmdletOperationPredicate) Matches(input ScriptCmdlet) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type ScriptExecutionOperationPredicate struct {
 
 func (p ScriptExecutionOperationPredicate) Matches(input ScriptExecution) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -57,15 +57,15 @@ type ScriptPackageOperationPredicate struct {
 
 func (p ScriptPackageOperationPredicate) Matches(input ScriptPackage) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/vmware/2022-05-01/virtualmachines/predicates.go b/resource-manager/vmware/2022-05-01/virtualmachines/predicates.go
index 9cd235e2a7d..6f80880ef21 100644
--- a/resource-manager/vmware/2022-05-01/virtualmachines/predicates.go
+++ b/resource-manager/vmware/2022-05-01/virtualmachines/predicates.go
@@ -11,15 +11,15 @@ type VirtualMachineOperationPredicate struct {
 
 func (p VirtualMachineOperationPredicate) Matches(input VirtualMachine) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/vmware/2022-05-01/workloadnetworks/predicates.go b/resource-manager/vmware/2022-05-01/workloadnetworks/predicates.go
index 8f8d94c11c7..4bba6f68758 100644
--- a/resource-manager/vmware/2022-05-01/workloadnetworks/predicates.go
+++ b/resource-manager/vmware/2022-05-01/workloadnetworks/predicates.go
@@ -11,15 +11,15 @@ type ResourceOperationPredicate struct {
 
 func (p ResourceOperationPredicate) Matches(input Resource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type WorkloadNetworkDhcpOperationPredicate struct {
 
 func (p WorkloadNetworkDhcpOperationPredicate) Matches(input WorkloadNetworkDhcp) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -57,15 +57,15 @@ type WorkloadNetworkDnsServiceOperationPredicate struct {
 
 func (p WorkloadNetworkDnsServiceOperationPredicate) Matches(input WorkloadNetworkDnsService) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -80,15 +80,15 @@ type WorkloadNetworkDnsZoneOperationPredicate struct {
 
 func (p WorkloadNetworkDnsZoneOperationPredicate) Matches(input WorkloadNetworkDnsZone) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -103,15 +103,15 @@ type WorkloadNetworkGatewayOperationPredicate struct {
 
 func (p WorkloadNetworkGatewayOperationPredicate) Matches(input WorkloadNetworkGateway) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -126,15 +126,15 @@ type WorkloadNetworkPortMirroringOperationPredicate struct {
 
 func (p WorkloadNetworkPortMirroringOperationPredicate) Matches(input WorkloadNetworkPortMirroring) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -149,15 +149,15 @@ type WorkloadNetworkPublicIPOperationPredicate struct {
 
 func (p WorkloadNetworkPublicIPOperationPredicate) Matches(input WorkloadNetworkPublicIP) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -172,15 +172,15 @@ type WorkloadNetworkSegmentOperationPredicate struct {
 
 func (p WorkloadNetworkSegmentOperationPredicate) Matches(input WorkloadNetworkSegment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -195,15 +195,15 @@ type WorkloadNetworkVMGroupOperationPredicate struct {
 
 func (p WorkloadNetworkVMGroupOperationPredicate) Matches(input WorkloadNetworkVMGroup) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -218,15 +218,15 @@ type WorkloadNetworkVirtualMachineOperationPredicate struct {
 
 func (p WorkloadNetworkVirtualMachineOperationPredicate) Matches(input WorkloadNetworkVirtualMachine) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/voiceservices/2023-04-03/communicationsgateways/predicates.go b/resource-manager/voiceservices/2023-04-03/communicationsgateways/predicates.go
index 19385bd23d9..89e471f5880 100644
--- a/resource-manager/voiceservices/2023-04-03/communicationsgateways/predicates.go
+++ b/resource-manager/voiceservices/2023-04-03/communicationsgateways/predicates.go
@@ -12,7 +12,7 @@ type CommunicationsGatewayOperationPredicate struct {
 
 func (p CommunicationsGatewayOperationPredicate) Matches(input CommunicationsGateway) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p CommunicationsGatewayOperationPredicate) Matches(input CommunicationsGat
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/voiceservices/2023-04-03/testlines/predicates.go b/resource-manager/voiceservices/2023-04-03/testlines/predicates.go
index bdbc648bb24..207198adb0d 100644
--- a/resource-manager/voiceservices/2023-04-03/testlines/predicates.go
+++ b/resource-manager/voiceservices/2023-04-03/testlines/predicates.go
@@ -12,7 +12,7 @@ type TestLineOperationPredicate struct {
 
 func (p TestLineOperationPredicate) Matches(input TestLine) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p TestLineOperationPredicate) Matches(input TestLine) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/appservicecertificateorders/predicates.go b/resource-manager/web/2022-09-01/appservicecertificateorders/predicates.go
index d2b38b95ae2..e7457040d0b 100644
--- a/resource-manager/web/2022-09-01/appservicecertificateorders/predicates.go
+++ b/resource-manager/web/2022-09-01/appservicecertificateorders/predicates.go
@@ -13,11 +13,11 @@ type AppServiceCertificateOrderOperationPredicate struct {
 
 func (p AppServiceCertificateOrderOperationPredicate) Matches(input AppServiceCertificateOrder) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p AppServiceCertificateOrderOperationPredicate) Matches(input AppServiceCe
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -46,11 +46,11 @@ type AppServiceCertificateResourceOperationPredicate struct {
 
 func (p AppServiceCertificateResourceOperationPredicate) Matches(input AppServiceCertificateResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -58,11 +58,11 @@ func (p AppServiceCertificateResourceOperationPredicate) Matches(input AppServic
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/appserviceenvironments/predicates.go b/resource-manager/web/2022-09-01/appserviceenvironments/predicates.go
index 77a07cc00c2..96a5324bde9 100644
--- a/resource-manager/web/2022-09-01/appserviceenvironments/predicates.go
+++ b/resource-manager/web/2022-09-01/appserviceenvironments/predicates.go
@@ -13,11 +13,11 @@ type AppServiceEnvironmentResourceOperationPredicate struct {
 
 func (p AppServiceEnvironmentResourceOperationPredicate) Matches(input AppServiceEnvironmentResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p AppServiceEnvironmentResourceOperationPredicate) Matches(input AppServic
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -46,11 +46,11 @@ type AppServicePlanOperationPredicate struct {
 
 func (p AppServicePlanOperationPredicate) Matches(input AppServicePlan) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -58,11 +58,11 @@ func (p AppServicePlanOperationPredicate) Matches(input AppServicePlan) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -78,19 +78,19 @@ type CsmUsageQuotaOperationPredicate struct {
 
 func (p CsmUsageQuotaOperationPredicate) Matches(input CsmUsageQuota) bool {
 
-	if p.CurrentValue != nil && (input.CurrentValue == nil && *p.CurrentValue != *input.CurrentValue) {
+	if p.CurrentValue != nil && (input.CurrentValue == nil || *p.CurrentValue != *input.CurrentValue) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
-	if p.NextResetTime != nil && (input.NextResetTime == nil && *p.NextResetTime != *input.NextResetTime) {
+	if p.NextResetTime != nil && (input.NextResetTime == nil || *p.NextResetTime != *input.NextResetTime) {
 		return false
 	}
 
-	if p.Unit != nil && (input.Unit == nil && *p.Unit != *input.Unit) {
+	if p.Unit != nil && (input.Unit == nil || *p.Unit != *input.Unit) {
 		return false
 	}
 
@@ -103,7 +103,7 @@ type InboundEnvironmentEndpointOperationPredicate struct {
 
 func (p InboundEnvironmentEndpointOperationPredicate) Matches(input InboundEnvironmentEndpoint) bool {
 
-	if p.Description != nil && (input.Description == nil && *p.Description != *input.Description) {
+	if p.Description != nil && (input.Description == nil || *p.Description != *input.Description) {
 		return false
 	}
 
@@ -116,7 +116,7 @@ type OutboundEnvironmentEndpointOperationPredicate struct {
 
 func (p OutboundEnvironmentEndpointOperationPredicate) Matches(input OutboundEnvironmentEndpoint) bool {
 
-	if p.Category != nil && (input.Category == nil && *p.Category != *input.Category) {
+	if p.Category != nil && (input.Category == nil || *p.Category != *input.Category) {
 		return false
 	}
 
@@ -132,19 +132,19 @@ type RemotePrivateEndpointConnectionARMResourceOperationPredicate struct {
 
 func (p RemotePrivateEndpointConnectionARMResourceOperationPredicate) Matches(input RemotePrivateEndpointConnectionARMResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -160,19 +160,19 @@ type ResourceMetricDefinitionOperationPredicate struct {
 
 func (p ResourceMetricDefinitionOperationPredicate) Matches(input ResourceMetricDefinition) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -189,11 +189,11 @@ type SiteOperationPredicate struct {
 
 func (p SiteOperationPredicate) Matches(input Site) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -201,11 +201,11 @@ func (p SiteOperationPredicate) Matches(input Site) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -218,7 +218,7 @@ type SkuInfoOperationPredicate struct {
 
 func (p SkuInfoOperationPredicate) Matches(input SkuInfo) bool {
 
-	if p.ResourceType != nil && (input.ResourceType == nil && *p.ResourceType != *input.ResourceType) {
+	if p.ResourceType != nil && (input.ResourceType == nil || *p.ResourceType != *input.ResourceType) {
 		return false
 	}
 
@@ -239,39 +239,39 @@ type StampCapacityOperationPredicate struct {
 
 func (p StampCapacityOperationPredicate) Matches(input StampCapacity) bool {
 
-	if p.AvailableCapacity != nil && (input.AvailableCapacity == nil && *p.AvailableCapacity != *input.AvailableCapacity) {
+	if p.AvailableCapacity != nil && (input.AvailableCapacity == nil || *p.AvailableCapacity != *input.AvailableCapacity) {
 		return false
 	}
 
-	if p.ExcludeFromCapacityAllocation != nil && (input.ExcludeFromCapacityAllocation == nil && *p.ExcludeFromCapacityAllocation != *input.ExcludeFromCapacityAllocation) {
+	if p.ExcludeFromCapacityAllocation != nil && (input.ExcludeFromCapacityAllocation == nil || *p.ExcludeFromCapacityAllocation != *input.ExcludeFromCapacityAllocation) {
 		return false
 	}
 
-	if p.IsApplicableForAllComputeModes != nil && (input.IsApplicableForAllComputeModes == nil && *p.IsApplicableForAllComputeModes != *input.IsApplicableForAllComputeModes) {
+	if p.IsApplicableForAllComputeModes != nil && (input.IsApplicableForAllComputeModes == nil || *p.IsApplicableForAllComputeModes != *input.IsApplicableForAllComputeModes) {
 		return false
 	}
 
-	if p.IsLinux != nil && (input.IsLinux == nil && *p.IsLinux != *input.IsLinux) {
+	if p.IsLinux != nil && (input.IsLinux == nil || *p.IsLinux != *input.IsLinux) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.SiteMode != nil && (input.SiteMode == nil && *p.SiteMode != *input.SiteMode) {
+	if p.SiteMode != nil && (input.SiteMode == nil || *p.SiteMode != *input.SiteMode) {
 		return false
 	}
 
-	if p.TotalCapacity != nil && (input.TotalCapacity == nil && *p.TotalCapacity != *input.TotalCapacity) {
+	if p.TotalCapacity != nil && (input.TotalCapacity == nil || *p.TotalCapacity != *input.TotalCapacity) {
 		return false
 	}
 
-	if p.Unit != nil && (input.Unit == nil && *p.Unit != *input.Unit) {
+	if p.Unit != nil && (input.Unit == nil || *p.Unit != *input.Unit) {
 		return false
 	}
 
-	if p.WorkerSizeId != nil && (input.WorkerSizeId == nil && *p.WorkerSizeId != *input.WorkerSizeId) {
+	if p.WorkerSizeId != nil && (input.WorkerSizeId == nil || *p.WorkerSizeId != *input.WorkerSizeId) {
 		return false
 	}
 
@@ -287,19 +287,19 @@ type UsageOperationPredicate struct {
 
 func (p UsageOperationPredicate) Matches(input Usage) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -315,19 +315,19 @@ type WorkerPoolResourceOperationPredicate struct {
 
 func (p WorkerPoolResourceOperationPredicate) Matches(input WorkerPoolResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/appserviceplans/predicates.go b/resource-manager/web/2022-09-01/appserviceplans/predicates.go
index 249025afb70..31b4416ccb0 100644
--- a/resource-manager/web/2022-09-01/appserviceplans/predicates.go
+++ b/resource-manager/web/2022-09-01/appserviceplans/predicates.go
@@ -13,11 +13,11 @@ type AppServicePlanOperationPredicate struct {
 
 func (p AppServicePlanOperationPredicate) Matches(input AppServicePlan) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p AppServicePlanOperationPredicate) Matches(input AppServicePlan) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -45,19 +45,19 @@ type CsmUsageQuotaOperationPredicate struct {
 
 func (p CsmUsageQuotaOperationPredicate) Matches(input CsmUsageQuota) bool {
 
-	if p.CurrentValue != nil && (input.CurrentValue == nil && *p.CurrentValue != *input.CurrentValue) {
+	if p.CurrentValue != nil && (input.CurrentValue == nil || *p.CurrentValue != *input.CurrentValue) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
-	if p.NextResetTime != nil && (input.NextResetTime == nil && *p.NextResetTime != *input.NextResetTime) {
+	if p.NextResetTime != nil && (input.NextResetTime == nil || *p.NextResetTime != *input.NextResetTime) {
 		return false
 	}
 
-	if p.Unit != nil && (input.Unit == nil && *p.Unit != *input.Unit) {
+	if p.Unit != nil && (input.Unit == nil || *p.Unit != *input.Unit) {
 		return false
 	}
 
@@ -73,19 +73,19 @@ type HybridConnectionOperationPredicate struct {
 
 func (p HybridConnectionOperationPredicate) Matches(input HybridConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -102,11 +102,11 @@ type SiteOperationPredicate struct {
 
 func (p SiteOperationPredicate) Matches(input Site) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -114,11 +114,11 @@ func (p SiteOperationPredicate) Matches(input Site) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/certificateordersdiagnostics/predicates.go b/resource-manager/web/2022-09-01/certificateordersdiagnostics/predicates.go
index 5558ff1eea2..149b9af0e1c 100644
--- a/resource-manager/web/2022-09-01/certificateordersdiagnostics/predicates.go
+++ b/resource-manager/web/2022-09-01/certificateordersdiagnostics/predicates.go
@@ -12,19 +12,19 @@ type DetectorResponseOperationPredicate struct {
 
 func (p DetectorResponseOperationPredicate) Matches(input DetectorResponse) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/certificates/predicates.go b/resource-manager/web/2022-09-01/certificates/predicates.go
index 658c9ed88c4..6a9b6eaebc6 100644
--- a/resource-manager/web/2022-09-01/certificates/predicates.go
+++ b/resource-manager/web/2022-09-01/certificates/predicates.go
@@ -13,11 +13,11 @@ type CertificateOperationPredicate struct {
 
 func (p CertificateOperationPredicate) Matches(input Certificate) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p CertificateOperationPredicate) Matches(input Certificate) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/containerapps/predicates.go b/resource-manager/web/2022-09-01/containerapps/predicates.go
index 859c818daa5..21173ca2726 100644
--- a/resource-manager/web/2022-09-01/containerapps/predicates.go
+++ b/resource-manager/web/2022-09-01/containerapps/predicates.go
@@ -13,11 +13,11 @@ type ContainerAppOperationPredicate struct {
 
 func (p ContainerAppOperationPredicate) Matches(input ContainerApp) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p ContainerAppOperationPredicate) Matches(input ContainerApp) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/containerappsrevisions/predicates.go b/resource-manager/web/2022-09-01/containerappsrevisions/predicates.go
index 68645ecedd8..863ff2fcae7 100644
--- a/resource-manager/web/2022-09-01/containerappsrevisions/predicates.go
+++ b/resource-manager/web/2022-09-01/containerappsrevisions/predicates.go
@@ -13,11 +13,11 @@ type RevisionOperationPredicate struct {
 
 func (p RevisionOperationPredicate) Matches(input Revision) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p RevisionOperationPredicate) Matches(input Revision) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/deletedwebapps/predicates.go b/resource-manager/web/2022-09-01/deletedwebapps/predicates.go
index 9368a6adcaf..5db9392a06f 100644
--- a/resource-manager/web/2022-09-01/deletedwebapps/predicates.go
+++ b/resource-manager/web/2022-09-01/deletedwebapps/predicates.go
@@ -12,19 +12,19 @@ type DeletedSiteOperationPredicate struct {
 
 func (p DeletedSiteOperationPredicate) Matches(input DeletedSite) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/diagnostics/predicates.go b/resource-manager/web/2022-09-01/diagnostics/predicates.go
index 1e2cca0259e..660a1c908be 100644
--- a/resource-manager/web/2022-09-01/diagnostics/predicates.go
+++ b/resource-manager/web/2022-09-01/diagnostics/predicates.go
@@ -12,19 +12,19 @@ type AnalysisDefinitionOperationPredicate struct {
 
 func (p AnalysisDefinitionOperationPredicate) Matches(input AnalysisDefinition) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,19 +40,19 @@ type DetectorDefinitionResourceOperationPredicate struct {
 
 func (p DetectorDefinitionResourceOperationPredicate) Matches(input DetectorDefinitionResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -68,19 +68,19 @@ type DetectorResponseOperationPredicate struct {
 
 func (p DetectorResponseOperationPredicate) Matches(input DetectorResponse) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -96,19 +96,19 @@ type DiagnosticCategoryOperationPredicate struct {
 
 func (p DiagnosticCategoryOperationPredicate) Matches(input DiagnosticCategory) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/domains/predicates.go b/resource-manager/web/2022-09-01/domains/predicates.go
index d5632e55afb..dcd7e69873b 100644
--- a/resource-manager/web/2022-09-01/domains/predicates.go
+++ b/resource-manager/web/2022-09-01/domains/predicates.go
@@ -13,11 +13,11 @@ type DomainOperationPredicate struct {
 
 func (p DomainOperationPredicate) Matches(input Domain) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p DomainOperationPredicate) Matches(input Domain) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -45,19 +45,19 @@ type DomainOwnershipIdentifierOperationPredicate struct {
 
 func (p DomainOwnershipIdentifierOperationPredicate) Matches(input DomainOwnershipIdentifier) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -70,7 +70,7 @@ type NameIdentifierOperationPredicate struct {
 
 func (p NameIdentifierOperationPredicate) Matches(input NameIdentifier) bool {
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/kubeenvironments/predicates.go b/resource-manager/web/2022-09-01/kubeenvironments/predicates.go
index cc4be415c6a..cf25ede1f18 100644
--- a/resource-manager/web/2022-09-01/kubeenvironments/predicates.go
+++ b/resource-manager/web/2022-09-01/kubeenvironments/predicates.go
@@ -13,11 +13,11 @@ type KubeEnvironmentOperationPredicate struct {
 
 func (p KubeEnvironmentOperationPredicate) Matches(input KubeEnvironment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -25,11 +25,11 @@ func (p KubeEnvironmentOperationPredicate) Matches(input KubeEnvironment) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/provider/predicates.go b/resource-manager/web/2022-09-01/provider/predicates.go
index e6e9e86c75a..152a0bd64bb 100644
--- a/resource-manager/web/2022-09-01/provider/predicates.go
+++ b/resource-manager/web/2022-09-01/provider/predicates.go
@@ -12,19 +12,19 @@ type ApplicationStackResourceOperationPredicate struct {
 
 func (p ApplicationStackResourceOperationPredicate) Matches(input ApplicationStackResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -41,23 +41,23 @@ type FunctionAppStackOperationPredicate struct {
 
 func (p FunctionAppStackOperationPredicate) Matches(input FunctionAppStack) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -74,23 +74,23 @@ type WebAppStackOperationPredicate struct {
 
 func (p WebAppStackOperationPredicate) Matches(input WebAppStack) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/recommendations/predicates.go b/resource-manager/web/2022-09-01/recommendations/predicates.go
index 5cb14a57ec6..bb0901fe9f3 100644
--- a/resource-manager/web/2022-09-01/recommendations/predicates.go
+++ b/resource-manager/web/2022-09-01/recommendations/predicates.go
@@ -12,19 +12,19 @@ type RecommendationOperationPredicate struct {
 
 func (p RecommendationOperationPredicate) Matches(input Recommendation) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/resourcehealthmetadata/predicates.go b/resource-manager/web/2022-09-01/resourcehealthmetadata/predicates.go
index 8a4386829cc..5682d0611c2 100644
--- a/resource-manager/web/2022-09-01/resourcehealthmetadata/predicates.go
+++ b/resource-manager/web/2022-09-01/resourcehealthmetadata/predicates.go
@@ -12,19 +12,19 @@ type ResourceHealthMetadataOperationPredicate struct {
 
 func (p ResourceHealthMetadataOperationPredicate) Matches(input ResourceHealthMetadata) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/resourceproviders/predicates.go b/resource-manager/web/2022-09-01/resourceproviders/predicates.go
index 691732c4e07..b7aa1094745 100644
--- a/resource-manager/web/2022-09-01/resourceproviders/predicates.go
+++ b/resource-manager/web/2022-09-01/resourceproviders/predicates.go
@@ -12,19 +12,19 @@ type BillingMeterOperationPredicate struct {
 
 func (p BillingMeterOperationPredicate) Matches(input BillingMeter) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,19 +40,19 @@ type CustomHostnameSitesOperationPredicate struct {
 
 func (p CustomHostnameSitesOperationPredicate) Matches(input CustomHostnameSites) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -68,19 +68,19 @@ type GeoRegionOperationPredicate struct {
 
 func (p GeoRegionOperationPredicate) Matches(input GeoRegion) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -96,19 +96,19 @@ type IdentifierOperationPredicate struct {
 
 func (p IdentifierOperationPredicate) Matches(input Identifier) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -124,19 +124,19 @@ type PremierAddOnOfferOperationPredicate struct {
 
 func (p PremierAddOnOfferOperationPredicate) Matches(input PremierAddOnOffer) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -152,19 +152,19 @@ type SourceControlOperationPredicate struct {
 
 func (p SourceControlOperationPredicate) Matches(input SourceControl) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/staticsites/predicates.go b/resource-manager/web/2022-09-01/staticsites/predicates.go
index fdc2b992119..b27ed7b5388 100644
--- a/resource-manager/web/2022-09-01/staticsites/predicates.go
+++ b/resource-manager/web/2022-09-01/staticsites/predicates.go
@@ -12,19 +12,19 @@ type DatabaseConnectionOperationPredicate struct {
 
 func (p DatabaseConnectionOperationPredicate) Matches(input DatabaseConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,19 +40,19 @@ type RemotePrivateEndpointConnectionARMResourceOperationPredicate struct {
 
 func (p RemotePrivateEndpointConnectionARMResourceOperationPredicate) Matches(input RemotePrivateEndpointConnectionARMResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -69,11 +69,11 @@ type StaticSiteARMResourceOperationPredicate struct {
 
 func (p StaticSiteARMResourceOperationPredicate) Matches(input StaticSiteARMResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -81,11 +81,11 @@ func (p StaticSiteARMResourceOperationPredicate) Matches(input StaticSiteARMReso
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -101,19 +101,19 @@ type StaticSiteBasicAuthPropertiesARMResourceOperationPredicate struct {
 
 func (p StaticSiteBasicAuthPropertiesARMResourceOperationPredicate) Matches(input StaticSiteBasicAuthPropertiesARMResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -129,19 +129,19 @@ type StaticSiteBuildARMResourceOperationPredicate struct {
 
 func (p StaticSiteBuildARMResourceOperationPredicate) Matches(input StaticSiteBuildARMResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -157,19 +157,19 @@ type StaticSiteCustomDomainOverviewARMResourceOperationPredicate struct {
 
 func (p StaticSiteCustomDomainOverviewARMResourceOperationPredicate) Matches(input StaticSiteCustomDomainOverviewARMResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -185,19 +185,19 @@ type StaticSiteFunctionOverviewARMResourceOperationPredicate struct {
 
 func (p StaticSiteFunctionOverviewARMResourceOperationPredicate) Matches(input StaticSiteFunctionOverviewARMResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -213,19 +213,19 @@ type StaticSiteLinkedBackendARMResourceOperationPredicate struct {
 
 func (p StaticSiteLinkedBackendARMResourceOperationPredicate) Matches(input StaticSiteLinkedBackendARMResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -241,19 +241,19 @@ type StaticSiteUserARMResourceOperationPredicate struct {
 
 func (p StaticSiteUserARMResourceOperationPredicate) Matches(input StaticSiteUserARMResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -269,19 +269,19 @@ type StaticSiteUserProvidedFunctionAppARMResourceOperationPredicate struct {
 
 func (p StaticSiteUserProvidedFunctionAppARMResourceOperationPredicate) Matches(input StaticSiteUserProvidedFunctionAppARMResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/topleveldomains/predicates.go b/resource-manager/web/2022-09-01/topleveldomains/predicates.go
index f19f93f7577..a85c5378eeb 100644
--- a/resource-manager/web/2022-09-01/topleveldomains/predicates.go
+++ b/resource-manager/web/2022-09-01/topleveldomains/predicates.go
@@ -24,7 +24,7 @@ func (p TldLegalAgreementOperationPredicate) Matches(input TldLegalAgreement) bo
 		return false
 	}
 
-	if p.Url != nil && (input.Url == nil && *p.Url != *input.Url) {
+	if p.Url != nil && (input.Url == nil || *p.Url != *input.Url) {
 		return false
 	}
 
@@ -40,19 +40,19 @@ type TopLevelDomainOperationPredicate struct {
 
 func (p TopLevelDomainOperationPredicate) Matches(input TopLevelDomain) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/webapps/predicates.go b/resource-manager/web/2022-09-01/webapps/predicates.go
index 8b410ab7693..a1ca5255822 100644
--- a/resource-manager/web/2022-09-01/webapps/predicates.go
+++ b/resource-manager/web/2022-09-01/webapps/predicates.go
@@ -12,19 +12,19 @@ type ApiKVReferenceOperationPredicate struct {
 
 func (p ApiKVReferenceOperationPredicate) Matches(input ApiKVReference) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -40,19 +40,19 @@ type BackupItemOperationPredicate struct {
 
 func (p BackupItemOperationPredicate) Matches(input BackupItem) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -68,19 +68,19 @@ type ContinuousWebJobOperationPredicate struct {
 
 func (p ContinuousWebJobOperationPredicate) Matches(input ContinuousWebJob) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -96,19 +96,19 @@ type CsmDeploymentStatusOperationPredicate struct {
 
 func (p CsmDeploymentStatusOperationPredicate) Matches(input CsmDeploymentStatus) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -124,19 +124,19 @@ type CsmPublishingCredentialsPoliciesEntityOperationPredicate struct {
 
 func (p CsmPublishingCredentialsPoliciesEntityOperationPredicate) Matches(input CsmPublishingCredentialsPoliciesEntity) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -152,19 +152,19 @@ type CsmUsageQuotaOperationPredicate struct {
 
 func (p CsmUsageQuotaOperationPredicate) Matches(input CsmUsageQuota) bool {
 
-	if p.CurrentValue != nil && (input.CurrentValue == nil && *p.CurrentValue != *input.CurrentValue) {
+	if p.CurrentValue != nil && (input.CurrentValue == nil || *p.CurrentValue != *input.CurrentValue) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
-	if p.NextResetTime != nil && (input.NextResetTime == nil && *p.NextResetTime != *input.NextResetTime) {
+	if p.NextResetTime != nil && (input.NextResetTime == nil || *p.NextResetTime != *input.NextResetTime) {
 		return false
 	}
 
-	if p.Unit != nil && (input.Unit == nil && *p.Unit != *input.Unit) {
+	if p.Unit != nil && (input.Unit == nil || *p.Unit != *input.Unit) {
 		return false
 	}
 
@@ -180,19 +180,19 @@ type DeploymentOperationPredicate struct {
 
 func (p DeploymentOperationPredicate) Matches(input Deployment) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -208,19 +208,19 @@ type FunctionEnvelopeOperationPredicate struct {
 
 func (p FunctionEnvelopeOperationPredicate) Matches(input FunctionEnvelope) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -236,19 +236,19 @@ type HostNameBindingOperationPredicate struct {
 
 func (p HostNameBindingOperationPredicate) Matches(input HostNameBinding) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -264,19 +264,19 @@ type IdentifierOperationPredicate struct {
 
 func (p IdentifierOperationPredicate) Matches(input Identifier) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -290,11 +290,11 @@ type PerfMonResponseOperationPredicate struct {
 
 func (p PerfMonResponseOperationPredicate) Matches(input PerfMonResponse) bool {
 
-	if p.Code != nil && (input.Code == nil && *p.Code != *input.Code) {
+	if p.Code != nil && (input.Code == nil || *p.Code != *input.Code) {
 		return false
 	}
 
-	if p.Message != nil && (input.Message == nil && *p.Message != *input.Message) {
+	if p.Message != nil && (input.Message == nil || *p.Message != *input.Message) {
 		return false
 	}
 
@@ -310,19 +310,19 @@ type ProcessInfoOperationPredicate struct {
 
 func (p ProcessInfoOperationPredicate) Matches(input ProcessInfo) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -338,19 +338,19 @@ type ProcessModuleInfoOperationPredicate struct {
 
 func (p ProcessModuleInfoOperationPredicate) Matches(input ProcessModuleInfo) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -366,19 +366,19 @@ type ProcessThreadInfoOperationPredicate struct {
 
 func (p ProcessThreadInfoOperationPredicate) Matches(input ProcessThreadInfo) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -394,19 +394,19 @@ type PublicCertificateOperationPredicate struct {
 
 func (p PublicCertificateOperationPredicate) Matches(input PublicCertificate) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -422,19 +422,19 @@ type RemotePrivateEndpointConnectionARMResourceOperationPredicate struct {
 
 func (p RemotePrivateEndpointConnectionARMResourceOperationPredicate) Matches(input RemotePrivateEndpointConnectionARMResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -451,11 +451,11 @@ type SiteOperationPredicate struct {
 
 func (p SiteOperationPredicate) Matches(input Site) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
@@ -463,11 +463,11 @@ func (p SiteOperationPredicate) Matches(input Site) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -483,19 +483,19 @@ type SiteConfigResourceOperationPredicate struct {
 
 func (p SiteConfigResourceOperationPredicate) Matches(input SiteConfigResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -511,19 +511,19 @@ type SiteConfigurationSnapshotInfoOperationPredicate struct {
 
 func (p SiteConfigurationSnapshotInfoOperationPredicate) Matches(input SiteConfigurationSnapshotInfo) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -539,19 +539,19 @@ type SiteExtensionInfoOperationPredicate struct {
 
 func (p SiteExtensionInfoOperationPredicate) Matches(input SiteExtensionInfo) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -567,19 +567,19 @@ type SlotDifferenceOperationPredicate struct {
 
 func (p SlotDifferenceOperationPredicate) Matches(input SlotDifference) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -595,19 +595,19 @@ type SnapshotOperationPredicate struct {
 
 func (p SnapshotOperationPredicate) Matches(input Snapshot) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -623,19 +623,19 @@ type TriggeredJobHistoryOperationPredicate struct {
 
 func (p TriggeredJobHistoryOperationPredicate) Matches(input TriggeredJobHistory) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -651,19 +651,19 @@ type TriggeredWebJobOperationPredicate struct {
 
 func (p TriggeredWebJobOperationPredicate) Matches(input TriggeredWebJob) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -679,19 +679,19 @@ type WebJobOperationPredicate struct {
 
 func (p WebJobOperationPredicate) Matches(input WebJob) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -707,19 +707,19 @@ type WebSiteInstanceStatusOperationPredicate struct {
 
 func (p WebSiteInstanceStatusOperationPredicate) Matches(input WebSiteInstanceStatus) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -736,23 +736,23 @@ type WorkflowEnvelopeOperationPredicate struct {
 
 func (p WorkflowEnvelopeOperationPredicate) Matches(input WorkflowEnvelope) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Kind != nil && (input.Kind == nil && *p.Kind != *input.Kind) {
+	if p.Kind != nil && (input.Kind == nil || *p.Kind != *input.Kind) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/workflowrunactions/predicates.go b/resource-manager/web/2022-09-01/workflowrunactions/predicates.go
index ff43f358517..fa466cf2c8e 100644
--- a/resource-manager/web/2022-09-01/workflowrunactions/predicates.go
+++ b/resource-manager/web/2022-09-01/workflowrunactions/predicates.go
@@ -12,19 +12,19 @@ type RequestHistoryOperationPredicate struct {
 
 func (p RequestHistoryOperationPredicate) Matches(input RequestHistory) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -39,15 +39,15 @@ type WorkflowRunActionOperationPredicate struct {
 
 func (p WorkflowRunActionOperationPredicate) Matches(input WorkflowRunAction) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -63,19 +63,19 @@ type WorkflowRunActionRepetitionDefinitionOperationPredicate struct {
 
 func (p WorkflowRunActionRepetitionDefinitionOperationPredicate) Matches(input WorkflowRunActionRepetitionDefinition) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/workflowruns/predicates.go b/resource-manager/web/2022-09-01/workflowruns/predicates.go
index b34d03ade8c..ad76dae5873 100644
--- a/resource-manager/web/2022-09-01/workflowruns/predicates.go
+++ b/resource-manager/web/2022-09-01/workflowruns/predicates.go
@@ -11,15 +11,15 @@ type WorkflowRunOperationPredicate struct {
 
 func (p WorkflowRunOperationPredicate) Matches(input WorkflowRun) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/workflowtriggerhistories/predicates.go b/resource-manager/web/2022-09-01/workflowtriggerhistories/predicates.go
index 124734e290f..20fca9c869f 100644
--- a/resource-manager/web/2022-09-01/workflowtriggerhistories/predicates.go
+++ b/resource-manager/web/2022-09-01/workflowtriggerhistories/predicates.go
@@ -11,15 +11,15 @@ type WorkflowTriggerHistoryOperationPredicate struct {
 
 func (p WorkflowTriggerHistoryOperationPredicate) Matches(input WorkflowTriggerHistory) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/workflowtriggers/predicates.go b/resource-manager/web/2022-09-01/workflowtriggers/predicates.go
index 16d7ba4c45e..724f6388737 100644
--- a/resource-manager/web/2022-09-01/workflowtriggers/predicates.go
+++ b/resource-manager/web/2022-09-01/workflowtriggers/predicates.go
@@ -11,15 +11,15 @@ type WorkflowTriggerOperationPredicate struct {
 
 func (p WorkflowTriggerOperationPredicate) Matches(input WorkflowTrigger) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/web/2022-09-01/workflowversions/predicates.go b/resource-manager/web/2022-09-01/workflowversions/predicates.go
index 25b691071af..1458230244b 100644
--- a/resource-manager/web/2022-09-01/workflowversions/predicates.go
+++ b/resource-manager/web/2022-09-01/workflowversions/predicates.go
@@ -12,19 +12,19 @@ type WorkflowVersionOperationPredicate struct {
 
 func (p WorkflowVersionOperationPredicate) Matches(input WorkflowVersion) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/webpubsub/2023-02-01/webpubsub/predicates.go b/resource-manager/webpubsub/2023-02-01/webpubsub/predicates.go
index 4e24b2d5a6c..80e966662cc 100644
--- a/resource-manager/webpubsub/2023-02-01/webpubsub/predicates.go
+++ b/resource-manager/webpubsub/2023-02-01/webpubsub/predicates.go
@@ -11,15 +11,15 @@ type CustomCertificateOperationPredicate struct {
 
 func (p CustomCertificateOperationPredicate) Matches(input CustomCertificate) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -34,15 +34,15 @@ type CustomDomainOperationPredicate struct {
 
 func (p CustomDomainOperationPredicate) Matches(input CustomDomain) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -57,15 +57,15 @@ type PrivateEndpointConnectionOperationPredicate struct {
 
 func (p PrivateEndpointConnectionOperationPredicate) Matches(input PrivateEndpointConnection) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -80,15 +80,15 @@ type PrivateLinkResourceOperationPredicate struct {
 
 func (p PrivateLinkResourceOperationPredicate) Matches(input PrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -103,15 +103,15 @@ type SharedPrivateLinkResourceOperationPredicate struct {
 
 func (p SharedPrivateLinkResourceOperationPredicate) Matches(input SharedPrivateLinkResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -127,19 +127,19 @@ type SignalRServiceUsageOperationPredicate struct {
 
 func (p SignalRServiceUsageOperationPredicate) Matches(input SignalRServiceUsage) bool {
 
-	if p.CurrentValue != nil && (input.CurrentValue == nil && *p.CurrentValue != *input.CurrentValue) {
+	if p.CurrentValue != nil && (input.CurrentValue == nil || *p.CurrentValue != *input.CurrentValue) {
 		return false
 	}
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Limit != nil && (input.Limit == nil && *p.Limit != *input.Limit) {
+	if p.Limit != nil && (input.Limit == nil || *p.Limit != *input.Limit) {
 		return false
 	}
 
-	if p.Unit != nil && (input.Unit == nil && *p.Unit != *input.Unit) {
+	if p.Unit != nil && (input.Unit == nil || *p.Unit != *input.Unit) {
 		return false
 	}
 
@@ -154,15 +154,15 @@ type WebPubSubHubOperationPredicate struct {
 
 func (p WebPubSubHubOperationPredicate) Matches(input WebPubSubHub) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
@@ -178,19 +178,19 @@ type WebPubSubResourceOperationPredicate struct {
 
 func (p WebPubSubResourceOperationPredicate) Matches(input WebPubSubResource) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Location != nil && (input.Location == nil && *p.Location != *input.Location) {
+	if p.Location != nil && (input.Location == nil || *p.Location != *input.Location) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/workloads/2023-04-01/monitors/predicates.go b/resource-manager/workloads/2023-04-01/monitors/predicates.go
index a1b5b5b809b..c4b22dac8c4 100644
--- a/resource-manager/workloads/2023-04-01/monitors/predicates.go
+++ b/resource-manager/workloads/2023-04-01/monitors/predicates.go
@@ -12,7 +12,7 @@ type MonitorOperationPredicate struct {
 
 func (p MonitorOperationPredicate) Matches(input Monitor) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p MonitorOperationPredicate) Matches(input Monitor) bool {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/workloads/2023-04-01/providerinstances/predicates.go b/resource-manager/workloads/2023-04-01/providerinstances/predicates.go
index b21a336534d..b05f3ea0313 100644
--- a/resource-manager/workloads/2023-04-01/providerinstances/predicates.go
+++ b/resource-manager/workloads/2023-04-01/providerinstances/predicates.go
@@ -11,15 +11,15 @@ type ProviderInstanceOperationPredicate struct {
 
 func (p ProviderInstanceOperationPredicate) Matches(input ProviderInstance) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/workloads/2023-04-01/sapapplicationserverinstances/predicates.go b/resource-manager/workloads/2023-04-01/sapapplicationserverinstances/predicates.go
index d8a65aa5e05..29caee9a23c 100644
--- a/resource-manager/workloads/2023-04-01/sapapplicationserverinstances/predicates.go
+++ b/resource-manager/workloads/2023-04-01/sapapplicationserverinstances/predicates.go
@@ -12,7 +12,7 @@ type SAPApplicationServerInstanceOperationPredicate struct {
 
 func (p SAPApplicationServerInstanceOperationPredicate) Matches(input SAPApplicationServerInstance) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SAPApplicationServerInstanceOperationPredicate) Matches(input SAPApplica
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/workloads/2023-04-01/sapcentralinstances/predicates.go b/resource-manager/workloads/2023-04-01/sapcentralinstances/predicates.go
index c2106fb5ce0..aff085e2e4a 100644
--- a/resource-manager/workloads/2023-04-01/sapcentralinstances/predicates.go
+++ b/resource-manager/workloads/2023-04-01/sapcentralinstances/predicates.go
@@ -12,7 +12,7 @@ type SAPCentralServerInstanceOperationPredicate struct {
 
 func (p SAPCentralServerInstanceOperationPredicate) Matches(input SAPCentralServerInstance) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SAPCentralServerInstanceOperationPredicate) Matches(input SAPCentralServ
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/workloads/2023-04-01/sapdatabaseinstances/predicates.go b/resource-manager/workloads/2023-04-01/sapdatabaseinstances/predicates.go
index e2c471253e7..eba9c19b470 100644
--- a/resource-manager/workloads/2023-04-01/sapdatabaseinstances/predicates.go
+++ b/resource-manager/workloads/2023-04-01/sapdatabaseinstances/predicates.go
@@ -12,7 +12,7 @@ type SAPDatabaseInstanceOperationPredicate struct {
 
 func (p SAPDatabaseInstanceOperationPredicate) Matches(input SAPDatabaseInstance) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SAPDatabaseInstanceOperationPredicate) Matches(input SAPDatabaseInstance
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}
 
diff --git a/resource-manager/workloads/2023-04-01/sapvirtualinstances/predicates.go b/resource-manager/workloads/2023-04-01/sapvirtualinstances/predicates.go
index c268c655168..7b18cd9294a 100644
--- a/resource-manager/workloads/2023-04-01/sapvirtualinstances/predicates.go
+++ b/resource-manager/workloads/2023-04-01/sapvirtualinstances/predicates.go
@@ -12,7 +12,7 @@ type SAPVirtualInstanceOperationPredicate struct {
 
 func (p SAPVirtualInstanceOperationPredicate) Matches(input SAPVirtualInstance) bool {
 
-	if p.Id != nil && (input.Id == nil && *p.Id != *input.Id) {
+	if p.Id != nil && (input.Id == nil || *p.Id != *input.Id) {
 		return false
 	}
 
@@ -20,11 +20,11 @@ func (p SAPVirtualInstanceOperationPredicate) Matches(input SAPVirtualInstance)
 		return false
 	}
 
-	if p.Name != nil && (input.Name == nil && *p.Name != *input.Name) {
+	if p.Name != nil && (input.Name == nil || *p.Name != *input.Name) {
 		return false
 	}
 
-	if p.Type != nil && (input.Type == nil && *p.Type != *input.Type) {
+	if p.Type != nil && (input.Type == nil || *p.Type != *input.Type) {
 		return false
 	}