Resolver.selectId() fixes + tests