Make sure display fields are stored; Add unit facet and display