Fix validation

Adam G-Hrequested to merge
issue/project_browser-3563781:3563781-project-browser-is into 2.1.x

Closes #3563781

Merge request reports