OZP-806: Better handle having JSON be the default type returned, rather than text/html