OPM - refactoring filters and fixes in printing

Sounds reasonable.  Also, I prefer this sort of duplication to building hacks into core features to support custom reports.