fix vendor select, improve timeout clearing