Fix model lookup by uri