separate code in another function
FIXME
FIXME
fix bug when fetch data continue
improve code strength
add order function
Merge branch 'dev'