Enhance how the router handle the request based on the Accept header #5093225748399