Change data fetch strategy
Adjust the onDraw order
Fix data loader issue