simplify alert-query following api changes