Match query for stream searches

Old default was term query.
Removed es options from client-side field definitions.
Cleanup old code