Adds important security fix so that sub-properties that aren't supposed
to be populated can't be.