Fix AB query scenarios message handling.