Some fixes to order service, make waiter service use the rest backend