Small changes to output, fixed filtering by protocol