Small fix and implemented alert categorization