maybe it would be good to move it to the listener too? What if some does not need flash messages.