Another attempt at fixing rest routes