Move post-processing into own index