Start to rework the bundle, rework the way of retrieving the Query parameters: using an EventListener