'entity' field-filtering

Searching the entity field is no longer truly working. We are using far to many '$and' in the meta-field matching routine.

Need to restick with using '$or' along a specific set of fields.

Basically need to adhere to the same search parameters as we are setting forth in 'meta_tags' gathering.