Bug fix with alert filtering