flash message related issues fixed