Shortcut shut down on health data source change

I had a shortcut on my iPhone to show my steps for a day. Since IOS 15 it fails to work.
If I rebuilt the shortcut and try to add a filter to only get the data from my watch as source, it quits the shortcut app. And the shortcut will no longer run.

I did reinstall the shortcuts app, but the shortcut still fails. Any suggestions?