minor fixes to emits and queries
fix several issues:

- issue with site_ids > 10 being returned as an int but < 10 as a string
  by python filter code, old map was emitting a string. argh.
- new fixtures have IHF/CHF changed to ihf/chf, support that too
- make more filter stuff domain-generic