Fixes on indexes for update_table