RAZ-2889: Fix for hosted indexing