query report definition as singular
add missing validations