added logic for displaying zip field or not