Fix & improve audience plugin