[OH] added custom fields to layout