Revised ClientActivity Lookup and Indexer parsing