diff --git a/.config/zsh/autoload/git/git-track b/.config/zsh/autoload/git/git-track
index 04ae6b1..79080c9 100755
--- a/.config/zsh/autoload/git/git-track
+++ b/.config/zsh/autoload/git/git-track
@@ -7,9 +7,10 @@ git for-each-ref --format='%(upstream),%(refname)' refs/heads refs/remotes \
 		s:(^|\n),([^/][^\n]*):\1\2,:g
 		s:,/:,:g
 		s:(^|\n)([^,]+),\n\2:\1\2:g
-		s:(^|\n)([^/,]*)([^\n]*\n\2(,|/))*:\n&:g
-		s:\n+$:\n:
+		s:(^|\n)([^/,]*)([^\n]*\n\2(,|/))*:\n,\n&:g
+		s:\n,\n+$:\n:
 	  ' \
 	| (echo remote,local; cat) \
-	| column -tdLs, -Na,b -Ob,a \
+	| sed -E 's:(.*),(.*):\2,\1:g; s:^,: ,:; s:,$:, :' \
+	| column -ts, \
 	| sed '2d; 1{p;s/./―/g}'