BZ-10071 & BZ-10271: removing energy advisors from the activity feed