Add compact to remove empty fields