Add more permissive searches by ID