Change indexer in proceeding content and add to upgrade step