Added more validation
Added postalcode filtering