Alter lookup to use id if available to list element