Another try, separating the default product handling between query and report list view.