switch to using slave ids for lookups