fixed hierarchy inside select; added 'match' behavior;