Added better recognizion for parent/child selection.