Bulk fix issue with alert message

Please review and merge