We should add indexes to both these new columns.