Updated select+focus