Fixed #5 _isOptional fix + content object progress calculation fix