fixing events to only need one listener and one subscriber tag