Add missing extras-on-demand IDs; fixed non-rich mailing address