diff --git a/btrbk b/btrbk
index 1f4f29c..3796612 100755
--- a/btrbk
+++ b/btrbk
@@ -187,40 +187,40 @@ my @config_target_types = qw(send-receive raw);
 
 my %table_formats = (
   list_volume => { table => [ qw( -volume_host -volume_port volume_path ) ],
-                   long  => [ qw(  volume_host  volume_port volume_path volume_rsh ) ],
+                   long  => [ qw(  volume_host -volume_port volume_path -volume_rsh ) ],
                    raw   => [ qw( volume_url volume_host volume_port volume_path volume_rsh ) ],
                  },
   list_source => { table => [ qw( -source_host -source_port source_subvolume snapshot_path snapshot_name ) ],
-                   long  => [ qw(  source_host  source_port source_subvolume snapshot_path snapshot_name source_rsh ) ],
+                   long  => [ qw(  source_host -source_port source_subvolume snapshot_path snapshot_name -source_rsh ) ],
                    raw   => [ qw( source_url source_host source_port source_path snapshot_path snapshot_name source_rsh ) ],
                  },
   list_target => { table => [ qw( -target_host -target_port target_path ) ],
-                   long  => [ qw(  target_host  target_port target_path target_rsh ) ],
+                   long  => [ qw(  target_host -target_port target_path -target_rsh ) ],
                    raw   => [ qw( target_url target_host target_port target_path target_rsh ) ],
                  },
-  list        => { table => [ qw( -source_host -source_port source_subvolume snapshot_path snapshot_name                   -target_host -target_port target_path ) ],
-                   long  => [ qw(  source_host  source_port source_subvolume snapshot_path snapshot_name snapshot_preserve  target_host  target_port target_path target_preserve ) ],
+  list        => { table => [ qw( -source_host -source_port source_subvolume snapshot_path snapshot_name -target_host -target_port target_path ) ],
+                   long  => [ qw(  source_host -source_port source_subvolume snapshot_path snapshot_name snapshot_preserve  target_host -target_port target_path target_preserve ) ],
                    raw   => [ qw( source_url source_host source_port source_subvolume snapshot_path snapshot_name snapshot_preserve target_url target_host target_port target_path target_preserve source_rsh target_rsh ) ],
                  },
 
   resolved    => { table => [ qw(      -source_host -source_port source_subvolume snapshot_subvolume status -target_host -target_port target_subvolume ) ],
-                   long  => [ qw( type  source_host  source_port source_subvolume snapshot_subvolume status  target_host  target_port target_subvolume target_type ) ],
+                   long  => [ qw( type  source_host -source_port source_subvolume snapshot_subvolume status  target_host -target_port target_subvolume target_type ) ],
                    raw   => [ qw( type source_host source_port source_path snapshot_path snapshot_name status target_host target_port target_path target_type source_rsh target_rsh ) ],
                  },
 
   schedule    => { table => [ qw( action -host -port subvolume scheme reason ) ],
-                   long  => [ qw( action  host  port root_path subvolume_path scheme reason ) ],
+                   long  => [ qw( action  host -port root_path subvolume_path scheme reason ) ],
                    raw   => [ qw( topic action url host port path hod dow min h d w m y) ],
                  },
 
   usage       => { table => [ qw( -host -port path size used free ) ],
-                   long  => [ qw( type host port path size used device_size device_allocated device_unallocated device_missing device_used free free_min data_ratio metadata_ratio global_reserve global_reserve_used ) ],
-                   raw   => [ qw( type host port path size used device_size device_allocated device_unallocated device_missing device_used free free_min data_ratio metadata_ratio global_reserve global_reserve_used ) ],
+                   long  => [ qw( type host -port path size used device_size device_allocated device_unallocated device_missing device_used free free_min data_ratio metadata_ratio global_reserve global_reserve_used ) ],
+                   raw   => [ qw( type host  port path size used device_size device_allocated device_unallocated device_missing device_used free free_min data_ratio metadata_ratio global_reserve global_reserve_used ) ],
                    RALIGN => { size=>1, used=>1, device_size=>1, device_allocated=>1, device_unallocated=>1, device_missing=>1, device_used=>1, free=>1, free_min=>1, data_ratio=>1, metadata_ratio=>1, global_reserve=>1, global_reserve_used=>1 },
                  },
 
   transaction => { table  => [ qw(                type status          -target_host -target_port target_subvolume -source_host -source_port source_subvolume parent_subvolume ) ],
-                   long   => [ qw(      localtime type status duration  target_host  target_port target_subvolume  source_host  source_port source_subvolume parent_subvolume message ) ],
+                   long   => [ qw(      localtime type status duration  target_host -target_port target_subvolume  source_host -source_port source_subvolume parent_subvolume message ) ],
                    tlog   => [ qw(      localtime type status          target_url source_url parent_url message ) ],
                    syslog => [ qw(                type status          target_url source_url parent_url message ) ],
                    raw    => [ qw( time localtime type status duration target_url source_url parent_url message ) ],