Cautonary repeat items with percussion instruments

There seems to be a bug with the new cautionary repeat items:

In some layouts the player does have both instruments with pitch and unpitched instruments. The cautionary items behave very weirdly in all of my layouts which contain both unpitched and pitched instruments.

At the moment there is no way to show the cautionary items for individual layouts. I can only turn them off flow wide in notation options. But I want the cautionary items on pitched-only layouts due to key changes on D.C.

yes, I can activate the feature, exports the parts I want to have the items, then deactivate it and export the rest. but this seems like a very inconvenient workflow, I hope this gets fixed in future updates.