This avoids running a forced-update of a null thread_id rows. An index is added (in the background) to hopefully make this easier in the future.