Thanks for this — filtering by r.wait_type instead of query text is a much better approach, and the sp_server_diagnostics exclusion is a real need for WSFC/AG environments.

A few things to address:

WAITFOR RECEIVE regression

The old code filtered t.text NOT LIKE N'%waitfor receive%' which caught Service Broker waits. The new r.wait_type <> N'WAITFOR' doesn't cover that — Service Broker uses BROKER_RECEIVE_WAITFOR as its wait type. Please add that to the exclusions so we don't regress.

Add XE_LIVE_TARGET_TVF exclusion

Please also exclude XE_LIVE_TARGET_TVF — Extended Events live target reads show up as long-running and aren't actionable.

Unused parameters

The excludeSpServerDiagnostics, excludeWaitFor, excludeBackupWaits, and maxLongRunningQueryCount parameters aren't used by any caller. Let's keep the method signature simple — just apply the exclusions unconditionally. If we need configurability later, we can add it then.

Minor code issues

• if (maxLongRunningQueryCount <= 5) clamps to minimum 5 — if the intent is to prevent invalid values, this should be <= 0 or < 1
• string LongRunningQueryCount — PascalCase for a local variable (should be camelCase per C# conventions)
• Trailing }; after the if block (semicolon unnecessary)
• The //using System.Collections.Generic; comment-out in LandingPage.xaml.cs is unrelated to this PR — please revert that file

Overall the direction is good, just needs some cleanup. Thanks!

Looks good — all the requested changes from the first review are addressed. The wait_type filtering approach is solid.

A couple minor style nits (non-blocking):

1. String interpolation is unnecessary — since the four filter strings are always applied unconditionally, they could just be inlined directly into the SQL constant. The separate variables + @$"" interpolation adds indirection without benefit. Not a blocker.

2. SP_SERVER_DIAGNOSTICS LIKE — r.wait_type NOT LIKE N'%SP_SERVER_DIAGNOSTICS%' could be r.wait_type <> N'SP_SERVER_DIAGNOSTICS' since that's the exact wait type name. Minor.

Approving as-is — these can be cleaned up later if desired.