Fix 3 selector issues