Better handling of mirror's next pass compared to current server pass

Signed-off-by: Martin Raspaud <martin.raspaud@smhi.se>