re-restructure
solution to the first part
(searches, no reports)