refs #5028 - switching org lookup to `find_by_id`