Define account fields once, and pass order ID during filter. Closes #3201