Fixed Async bugs in MainDataEntry