alerts: More changes

* More things to do yeah

Reviewed-by Harris Tzovanakis<me@drjova.com>
Signed-off-by: Harris Tzovanakis <me@drjova.com>