remove use of nativequery in DataTable macros