fix contact and user lookups