Only include extra parameters for CSV downloads
Remove hard limit of three matching criteria, and also reduced the amount of computation required for each controller call