Add extra fields to search and CSV output