Be consistent about how ActiveRecords is computed
Fix new ContributionSearch model to work with the Tax/NonTax