Change entity routes to conform to the new standards + route fix

follow up for #15