LPS-51357 Other entities are also affected, so fix with a wider approach (though, it's still ugly, doesn't solve the multiple reindexing issue)