Refs #4431 - Enhance regexp to catch all parts of the reports