several changes, including:

- break down FADA observations report by IHF/CHF
- fix key structures to support the filtering we need
reorg to support multiple sets of reports, and some changes