allow searching on tenant_id or tenant_name

Change-Id: I2f5acb8cfee0ee979c6419ae1b449b2c939dca60