minor qneport refactor