Wrong expiration dates in warranty report send from OME

HI

We use OME 2.0.1 and receive daily warranty reports but a lot of expiration dates are wrong.

In Expiration date column I see "Next business Day" support expiration day but i additionally have 4h pro support for our devices with the later date of expiry.
On The OME web site in "Warranty Information" report i have the same wrong dates of support expiration.

Sorry - dates in reports are ok only for NBD support but no for 4h pro support which expires later.

Is there any resolution to change this? I want to see I would like to see the most distant date of expiry support. It doesn't matter what kind/level of support it is.

Thanks

Jarek Kowalski