[TASK] Updated handling of flash messages