corrections to logic for selecting notifications