Enhance non-bayeux server responses