improved vendor detection