Changes to discovery
Fix selection