old data + new category (archive) + few fix