improve WifiSelector