Added datafield lookup bug fix