minimise use of SingleFieldId