Updating for CSV export and multi type search