added viewer and validation queries