Add alert count, Rework lastChecked identification