First pass to fix updates on secondary indexes