modified logic related to building short name field