cleanup and adding according list for alerts view