[-] Core: Fix #PSCFV-8887 - improve performance of search indexation