Fix order of fields

The field order was preventing the provider from being selected first
and so the cluster was never shown.