bis waiterCurrentOrder refactored