MB-146 #Updated queries for notifications to return consistent results