Advanced Search by Event Type does not work

Replicated on demo. From Advanced Search select 'Performance' under Events pane -> Event Type. Click Search. You get 33 results. However there is only one 'Performance' Event (Summer Solstice Concert) - and this event has 11 participants. Also, the results block does not show Event Type as a search criteria.

Possibly related issue (which should also be fixed):

In 'Find Participants" (search) - the following sequence does NOT work properly:
1. Select 'Performance' in Event Type and click 'Search'

• expected results
  2. Clear 'Event Type' field and select 'Rain Forest Cup....' in Event Name and click 'Search'
• your Event Name selection is ignored, the search still pulls up Event Type = Performance