Zipcode - Bug 1 and 2