LRDCOM-7359 AMS - improved ams by including an indexer