Fixed issues with advertisement scenarios