Update a few queries for the second pass of the I_S table updates.