Fix user report country display and n+1. Fixes #352