AR goals staging and UPSERT, final tweaks to ES report card views