Fix EntityUtil.getExtendedData saving when using the default