LPS-32153 move logic to the BaseIndexer