Updates to auto post-processing code, additional code added to ensure indexer is always set to the correct value