#204. CR corrections for optimizing indexing task