In some situations, the impact of this issue can be mitigated by using a custom search, see the description of how to do it here https://jira.xwiki.org/browse/XWIKI-8583?focusedId=121593&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-121593 .
