Only add OBI scores for countries assigned to users.
Also a few bug fixes included in this comment.