Aden 1522 wg show ads missing

Porting the P2 fixes from release-250