Analytics event category and action tweaks