Fix most of query zipcode issue