LPS-41663 fix problem with indexer
LPS-41663 SF - make it more efficient