Rework backup alerts
merging eisq master branch