Make some indexes update correctly instead of just add