Enhance reports::validate