Only add country state or postcode to the query if the parameter is set and not null