improved selector performance