This issue feels very close to XWIKI-21878, I've been working on it and tried to improve it. There's currently an ongoing PR at https://github.com/xwiki/xwiki-platform/pull/2888