Fix service lookup for WiFi and WiMAX devices