Add default null
Refactoring of link form