Calculate size at the start, not every time
Use universal field, not client only method
Merge branch 'hotfix/taglistchopped' into private/all-my-pr-fixes