Normalize id handling in find and get by id