Cleanup
Fix types
Cleanup
Fix oneapi client type
Move client_type field down to mimic {ci, ui, ct, imi} index