Fixes merge conflict with stashed changes and adds an extra variable in the ES controller for chosen event