Fixed WF-1717 added auto fill option.