Improving multiple field logic.
Fixing adding link bug.