ConsultTaxPayer refactored