fix custom fields expression