Refinements to checkbox selection of data

Colours are now consistent, wantedFields is not reconstructed multiple
times in an if loop, etc.