Fix issue with auto ID in find methods