Added cli arg tenant_id, changed instance search logic