Any fields not strictly needed should be buried behind Advanced

Ticket:	#5353