Add in find-by-id for edge