add check for 5-digit zipcode
merge issues