improve selector robustness