Redo indexes for new SELECTs and trivially tweak one old query