Fix showing messages on route change
Fix messages reset