Issue #23448 Fix invoice performance.