Fix similar jobs bugs