Flash messages fixes

| Q             | A
| ------------- | ---
| Fixed tickets | -
| License       | MIT