Add task_id to query to match check_timeout()