Added order by taxpayer and SN folder