Refactors class so that it now accepts excplicit names of the events to listen to
Fixes issue where request parameters interfered with special q-parameter