Improved handling service with long waits also wit...

Improved handling service with long waits also with reservation.