Have better checks if audience should be set or not

Have better checks if audience should be set or not #4904