Fixes count rendering after merge, truncates subjects in callouts