Select: further work on fallback and cleanup