Few tweaks to gernerate field id feature.