Fix cityStZip when state is null