Completed QueryValidator #7