fix map drag
fix list ad
Merge origin/master