Tax Inquiry: fixed refrences to non-existing database fields.