Normalize address info in more json structures, update templates to match and skip gravatar