Dino catalog/mohammad Attempt 1

Mentioned in code review, these defaults are not really reasonable. Use `nil` when there's no data.