fixed include duplicate and missing id