Fix archive by query/archive aggregate row.