- Added logic for filtering alarms