Advertise show refactor