find_id safety fix