Improves BATMAN-6 - Booking request handling and transition to manual factored out

Sign-off: @leolara