+ ensure validation of secondary diagnosis
+ fixes for handling secondary diagnosis