FIX ANALYTICS with new apiclient