Fix nested selections