Search Builder: Export Bugs

Export of Search Builder results has several problems.
1. Export Primary Contact fields outputs ALL records in the DB
2. Export Selected Fields throws a PHP error (at least with the IN operator):
Fatal error: Unsupported operand types in /home/demo.civicrm.org/svn/stable/CRM/Contact/Form/Task/Export/Map.php on line 82

You can recreate these on demo as follows...from Search Builder, search on

• Individuals >> Group(s) >> IN >> (2,3)

This gives you the correct ~20 contacts in the 2 groups.
Click "all 20 records" and select Export from the drop-down.

NOTE: On some tests, the "count" was correct on the Export form ("20 records selected for export") - other times it showed ("1 record selected for export") ??

Select "Export PRIMARY contact" fields - you get a CSV w/ all contacts in the DB
Select "Export Selected fields" - you get the PHP error above.