Fixed hidden ZIP and state fields #347