RAZ-3356 : Major speed improvement in search compared to older versions