NOJIRA report enhancements