Fix some plural/single swaps and disable {id} to test with swagger-ui