Add external_file_field functionality to query