Fixed some bugs related to audience construction