Fixed issue with null combo types.
Fixed issues with ids.