clean up
support fetching all fields when using the command line