Refactoring DoiAssignment

Correcting DOI assignment based on UI realities