Trailing space fixed, export function using new field names