Changed several things how we conduct indexing on hosted and self-hosted platform