Add category filter to report - refs BT#8337